# HG changeset patch # User nemo # Date 1352347469 18000 # Node ID ffd5eba8f7c2c9b1d3142fdb196f81e677c9dfe6 # Parent 195677b0d06bed7cb2e843c6d7f185aa4a6ada8d objects too diff -r 195677b0d06b -r ffd5eba8f7c2 hedgewars/uGears.pas --- 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; diff -r 195677b0d06b -r ffd5eba8f7c2 hedgewars/uLand.pas --- 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