Merge pull request #79 from mkapusnik/randomize-team-positioning

More random player positioning
odanek · Mar 30, 2018 · 5652510 · 5652510
2 parents 35dbbfa + 82a2371
commit 5652510
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/source/gamemodes/TeamDeathMatch.cpp b/source/gamemodes/TeamDeathMatch.cpp
@@ -72,11 +72,8 @@ namespace Duel6 {
             Int32 ammo = Math::random(ammoRange.first, ammoRange.second);
 
             Int32 playerTeam = (playerIndex + randomizer) % teamsCount;
-            Int32 playerTeamIndex = playerIndex / teamsCount;
-
-            bool direction = Math::random(2) != 0;
-            Int32 lowerBound = layerSpan * playerTeam;
-            Int32 index = lowerBound + midpoint + (direction ? playerTeamIndex : -playerTeamIndex) % midpoint;
+            Int32 playerTeamIndex = Math::random(layerSpan);
+            Int32 index = (layerSpan * playerTeam) + playerTeamIndex % layerSpan;
 
             Level::StartingPosition position = startingPositions[index];
             player.startRound(world, position.first, position.second, ammo, Weapon::getRandomEnabled(game.getSettings()));