Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
objects too
authornemo
Wed, 07 Nov 2012 23:04:29 -0500
changeset 8011 ffd5eba8f7c2
parent 8010 195677b0d06b
child 8012 2a61631a4505
child 8013 5cbf6e4361f4
objects too
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
hedgewars/uLand.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGears.pas	Wed Nov 07 21:47:00 2012 -0500
+++ b/hedgewars/uGears.pas	Wed Nov 07 23:04:29 2012 -0500
@@ -473,7 +473,6 @@
 ScriptCall('onGameTick');
 if GameTicks mod 20 = 0 then ScriptCall('onGameTick20');
 
-AddFileLog('CheckSum = ' + inttostr(CheckSum));
 inc(GameTicks)
 end;
 
--- a/hedgewars/uLand.pas	Wed Nov 07 21:47:00 2012 -0500
+++ b/hedgewars/uLand.pas	Wed Nov 07 23:04:29 2012 -0500
@@ -582,8 +582,10 @@
 procedure GenMap;
 var x, y, w, c: Longword;
     usermap, usermask, map, mask: shortstring;
+    maskOnly: boolean;
 begin
     hasBorder:= false;
+    maskOnly:= false;
 
     LoadThemeConfig;
 
@@ -601,6 +603,7 @@
             if (not(FileExists(usermap)) and FileExists(usermask)) or
                (not(FileExists(map)) and FileExists(mask)) then
                 begin
+                maskOnly:= true;
                 LoadMask;
                 GenLandSurface
                 end
@@ -693,7 +696,7 @@
 if (GameFlags and gfDisableGirders) <> 0 then
     hasGirders:= false;
 
-if ((GameFlags and gfForts) = 0) and (Pathz[ptMapCurrent] = '') then
+if (GameFlags and gfForts = 0) and (maskOnly or (Pathz[ptMapCurrent] = '')) then
     AddObjects
     
 else
hedgewars