Voting for round to end, level generation improvements

2016-02-12 19:39:24 +02:00
parent 3ffc19485b
commit c6f52cc68f
20 changed files with 294 additions and 129 deletions
@@ -355,6 +355,8 @@ namespace Barotrauma
                    playYourself.UserData = "playyourself";
                }

+                GameMain.Server.Voting.ResetVotes(GameMain.Server.ConnectedClients);
+
                if (GameMain.Server.RandomizeSeed) LevelSeed = ToolBox.RandomSeed(8);
                if (GameMain.Server.SubSelectionMode == SelectionMode.Random) subList.Select(Rand.Range(0,subList.CountChildren));
                if (GameMain.Server.ModeSelectionMode == SelectionMode.Random) modeList.Select(Rand.Range(0, modeList.CountChildren));
@@ -368,6 +370,8 @@ namespace Barotrauma
                    spectateButton.UserData = "spectateButton";
                }

+                GameMain.Client.Voting.ResetVotes(GameMain.Client.OtherClients);
+
                UpdatePlayerFrame(GameMain.Client.CharacterInfo);
            }