# HG changeset patch
# User nemo
# Date 1286481748 14400
# Node ID 0b982d340633cc143676c064940818693274cef8
# Parent  8cdbc0505f1850a7093306ef5e9ffa73bfc8ebbb
bug #83 - move test of disabled land objects into AddObjects

diff -r 8cdbc0505f18 -r 0b982d340633 hedgewars/uLand.pas
--- a/hedgewars/uLand.pas	Wed Oct 06 20:21:20 2010 -0400
+++ b/hedgewars/uLand.pas	Thu Oct 07 16:02:28 2010 -0400
@@ -1308,9 +1308,9 @@
 if (GameFlags and gfDisableGirders) <> 0 then hasGirders:= false;
 
 if ((GameFlags and gfForts) = 0)
-    and ((GameFlags and gfDisableLandObjects) = 0)
     and (Pathz[ptMapCurrent] = '')
-    then AddObjects;
+    then AddObjects
+else AddProgress();
 
 FreeLandObjects;
 
diff -r 8cdbc0505f18 -r 0b982d340633 hedgewars/uLandObjects.pas
--- a/hedgewars/uLandObjects.pas	Wed Oct 06 20:21:20 2010 -0400
+++ b/hedgewars/uLandObjects.pas	Thu Oct 07 16:02:28 2010 -0400
@@ -529,7 +529,7 @@
         i:=i+int;
     until (i>rightX-int);
     end;
-AddThemeObjects(ThemeObjects);
+if (GameFlags and gfDisableLandObjects) = 0 then AddThemeObjects(ThemeObjects);
 AddProgress();
 FreeRects();
 end;