--- a/hedgewars/uStore.pas	Sun Feb 12 15:04:17 2012 +0100
+++ b/hedgewars/uStore.pas	Sun Feb 12 15:27:25 2012 +0100
@@ -126,7 +126,6 @@
     r, rr: TSDL_Rect;
     drY: LongInt;
     texsurf, flagsurf, iconsurf: PSDL_Surface;
-    s: shortstring;
 begin
 r.x:= 0;
 r.y:= 0;
@@ -369,7 +368,7 @@
 // This should maybe be flagged. It wastes quite a bit of memory.
                 if not reload then
                     begin
-{$IF DEFINED(DARWIN) OR DEFINED(WIN32) or DEFINED(ANDROID)}
+{$IFDEF USE_CONTEXT_RESTORE}
                     Surface:= tmpsurf 
 {$ELSE}
                     if saveSurf then
@@ -1030,7 +1029,7 @@
         exit;
 {$ELSE}
         SetScale(cDefaultZoomLevel);
-     {$IF DEFINED(DARWIN) OR DEFINED(WIN32) or DEFINED(ANDROID)}
+     {$IFDEF USE_CONTEXT_RESTORE}
         reinit:= true;
         StoreRelease(true);
         ResetLand;