hedgewars: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:19cb0de79287
+:cb36d6df3814
 procedure AssignHHCoords;
 var i, t, p, j: LongInt;
 ar: array[0..Pred(cMaxHHs)] of PHedgehog;
 Count: Longword;
-divide: boolean;
+divide, sectionDivide: boolean;
 begin
 if (GameFlags and gfPlaceHog) <> 0 then
 PlacingHogs:= true;
 divide:= ((GameFlags and gfDivideTeams) <> 0);
-// in section-divide mode, divide the map into equal-width sections and put each clan in one of them
+(* sectionDivide will determine the mode of hog distribution
-if divide then
+*
+* On generated maps or maps not designed with divided mode in mind,
+* using spawning sections can be problematic, because some sections may
+* contain too little land surface for sensible spawning.
+*
+* if sectionDivide is true, the map will be sliced into equal-width sections
+* and one team spawned in each
+* if false, the hogs will be spawned normally and sorted by teams after
+*
+*)
+// TODO: there might be a smarter way to decide if dividing clans into equal-width map sections makes sense
+// e.g. by checking if there is enough spawn area in each section
+sectionDivide:= divide and ((cMapGen = mgForts) or (ClansCount = 2));
+// divide the map into equal-width sections and put each clan in one of them
+if sectionDivide then
 begin
 t:= leftX;
 for p:= 0 to (ClansCount - 1) do
 begin
 with SpawnClansArray[p]^ do
 AddFileLog('Placed flower for hog at coordinates (' + inttostr(hwRound(Gear^.X)) + ',' + inttostr(hwRound(Gear^.Y)) + ')')
 end;
 // divided teams: sort the hedgehogs from left to right by clan and shuffle clan members
-if divide then
+if divide and (not sectionDivide) then
 SortHHsByClan();
 end;
 {procedure AmmoFlameWork(Ammo: PGear);

changeset 11896	cb36d6df3814
parent 11895	19cb0de79287
child 11914	c9bad8a01185