Override both hog placements, this makes divide teams pretty much useless with hog placement mode. Restricting hog placement to one side might be a nice addition.
authornemo
Mon, 08 Feb 2010 18:12:06 +0000
changeset 2771 477957a89881
parent 2770 851313907bcb
child 2772 1965eba10be6
Override both hog placements, this makes divide teams pretty much useless with hog placement mode. Restricting hog placement to one side might be a nice addition.
hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Mon Feb 08 16:03:58 2010 +0000
+++ b/hedgewars/uGears.pas	Mon Feb 08 18:12:06 2010 +0000
@@ -1775,6 +1775,7 @@
 	ar: array[0..Pred(cMaxHHs)] of PHedgehog;
 	Count: Longword;
 begin
+if (GameFlags and gfPlaceHog) <> 0 then PlacingHogs:= true;
 if (GameFlags and (gfForts or gfDivideTeams)) <> 0 then
 	begin
 	t:= 0;
@@ -1788,7 +1789,8 @@
 						with Hedgehogs[i] do
 							if (Gear <> nil) and (Gear^.X.QWordValue = 0) then
 								begin
-                                FindPlace(Gear, false, t, t + LAND_WIDTH div 2);// could make Gear == nil
+                                if PlacingHogs then Unplaced:= true
+                                else FindPlace(Gear, false, t, t + LAND_WIDTH div 2);// could make Gear == nil;
 								if Gear <> nil then
 									begin
 									Gear^.Pos:= GetRandom(49);
@@ -1799,7 +1801,6 @@
 		end
 	end else // mix hedgehogs
 	begin
-    if (GameFlags and gfPlaceHog) <> 0 then PlacingHogs:= true;
 	Count:= 0;
 	for p:= 0 to Pred(TeamsCount) do
 		with TeamsArray[p]^ do