--- asc-2.4.0.0/source/graphics/blitter.h	2008-07-11 23:26:58.000000000 +0200
+++ asc-2.4.0.0.new/source/graphics/blitter.h	2012-01-15 14:36:39.753033150 +0100
@@ -749,7 +748,7 @@
 
       void assign ( PixelType src, PixelType* dest )
       {
-         if ( isOpaque(src ) ) {
+         if ( this->isOpaque(src ) ) {
             *dest = src;
          }
       };
@@ -769,7 +768,7 @@
 
       void assign ( PixelType src, PixelType* dest )
       {
-         if ( isOpaque(src ) ) {
+         if ( this->isOpaque(src ) ) {
             *dest = src;
          }
       };
@@ -928,6 +927,7 @@
 };
 
 
+#include "drawing.h"
 
 extern const int ColorMerger_Alpha_XLAT_Table_shadings[8]; 
 
--- asc-2.4.0.0/source/graphics/drawing.h	2008-06-29 13:25:41.000000000 +0200
+++ asc-2.4.0.0.new/source/graphics/drawing.h	2012-01-15 14:37:33.193034937 +0100
@@ -169,7 +169,7 @@
          PixelType* pix = (PixelType*)( surf.pixels() );
          pix += pos.y * surf.pitch()/pixelsize + pos.x;
 
-         assign ( src, pix );
+         this->assign ( src, pix );
       };
 };
 
--- asc-2.4.0.0/source/graphics/surface.cpp	2009-04-04 23:21:47.000000000 +0200
+++ asc-2.4.0.0.new/source/graphics/surface.cpp	2012-01-14 12:03:26.933912267 +0100
@@ -579,7 +579,7 @@
 
       void assign ( PixelType src, PixelType* dest )
       {
-         if ( !isOpaque(src ) )
+         if ( !this->isOpaque(src ) )
             *dest &= alphamask;
       };
 
--- asc-2.4.0.0/source/itemrepository.cpp	2009-11-01 12:05:42.000000000 +0100
+++ asc-2.4.0.0.new/source/itemrepository.cpp	2012-01-14 12:06:59.420909604 +0100
@@ -88,7 +88,7 @@
    t->filename = fileName;
    t->location = location;
    t->archive = prc.getArchive();
-   add ( t );
+   this->add ( t );
 }
 
 
@@ -110,7 +110,7 @@
       t->archive = stream.readString();
       dataLoaderTicker();
 
-      add ( t );
+      this->add ( t );
       // add ( T::newFromStream(stream ));
    }
 }