bug #83 - move test of disabled land objects into AddObjects
authornemo
Thu, 07 Oct 2010 16:02:28 -0400
changeset 3936 0b982d340633
parent 3934 8cdbc0505f18
child 3937 494221b5950e
bug #83 - move test of disabled land objects into AddObjects
hedgewars/uLand.pas
hedgewars/uLandObjects.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;
 
--- 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;