# HG changeset patch # User henek # Date 1289062569 14400 # Node ID eaff5615f9760c64f5940cfa67267798f7263750 # Parent 5efa80494e31b2ecf23dd6c03d6ef871bb8d423c Decouple forts from divide/mines/explosives, since those can be set individually these days diff -r 5efa80494e31 -r eaff5615f976 hedgewars/uAmmos.pas --- a/hedgewars/uAmmos.pas Sat Nov 06 12:33:24 2010 -0400 +++ b/hedgewars/uAmmos.pas Sat Nov 06 12:56:09 2010 -0400 @@ -92,7 +92,6 @@ var cnt: Longword; a: TAmmoType; ammos: TAmmoCounts; - substr: shortstring; // TEMPORARY begin TryDo((byte(ammoLoadout[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoProbability[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoDelay[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoReinforcement[0]) = byte(ord(High(TAmmoType)))), 'Incomplete or missing ammo scheme set (incompatible frontend or demo/save?)', true); diff -r 5efa80494e31 -r eaff5615f976 hedgewars/uGears.pas --- a/hedgewars/uGears.pas Sat Nov 06 12:33:24 2010 -0400 +++ b/hedgewars/uGears.pas Sat Nov 06 12:56:09 2010 -0400 @@ -1220,18 +1220,15 @@ FindPlace(TrainingTargetGear, false, 0, LAND_WIDTH); end; -if ((GameFlags and gfForts) = 0) then +for i:= 0 to Pred(cLandMines) do begin - for i:= 0 to Pred(cLandMines) do - begin - Gear:= AddGear(0, 0, gtMine, 0, _0, _0, 0); - FindPlace(Gear, false, 0, LAND_WIDTH); - end; - for i:= 0 to Pred(cExplosives) do - begin - Gear:= AddGear(0, 0, gtExplosives, 0, _0, _0, 0); - FindPlace(Gear, false, 0, LAND_WIDTH); - end; + Gear:= AddGear(0, 0, gtMine, 0, _0, _0, 0); + FindPlace(Gear, false, 0, LAND_WIDTH); + end; +for i:= 0 to Pred(cExplosives) do + begin + Gear:= AddGear(0, 0, gtExplosives, 0, _0, _0, 0); + FindPlace(Gear, false, 0, LAND_WIDTH); end; if (GameFlags and gfLowGravity) <> 0 then @@ -1480,7 +1477,7 @@ Count: Longword; begin if (GameFlags and gfPlaceHog) <> 0 then PlacingHogs:= true; -if (GameFlags and (gfForts or gfDivideTeams)) <> 0 then +if (GameFlags and gfDivideTeams) <> 0 then begin t:= 0; TryDo(ClansCount = 2, 'More or less than 2 clans on map in divided teams mode!', true);