vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Voting for round to end, level generation improvements

Browse Source
This commit is contained in:
Regalis
2016-02-12 19:39:24 +02:00
parent 3ffc19485b
commit c6f52cc68f
20 changed files with 294 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Subsurface/Source/Networking/GameServer.cs
View File

@@ -473,6 +473,12 @@ namespace Barotrauma.Networking
break;
case (byte)PacketTypes.Vote:
Voting.RegisterVote(inc, ConnectedClients);
if (Voting.AllowEndVoting &&
((float)EndVoteCount / (float)EndVoteMax) >= EndVoteRequiredRatio)
{
EndButtonHit(null,null);
}
break;
case (byte)PacketTypes.RequestNetLobbyUpdate:
UpdateNetLobby(null, null);
@@ -860,9 +866,11 @@ namespace Barotrauma.Networking
private bool EndButtonHit(GUIButton button, object obj)
{
if (!gameStarted) return false;
string endMessage = "The round has ended." + '\n';
if (TraitorManager!=null)
if (TraitorManager != null)
{
endMessage += TraitorManager.GetEndMessage();
}
@@ -1092,7 +1100,7 @@ namespace Barotrauma.Networking
base.Draw(spriteBatch);
if (settingsFrame != null) settingsFrame.Draw(spriteBatch);
if (!ShowNetStats) return;
int width = 200, height = 300;
@@ -1465,14 +1473,22 @@ namespace Barotrauma.Networking
jobPreferences = new List<JobPrefab>(JobPrefab.List.GetRange(0,3));
}
public object GetVote(VoteType voteType)
public T GetVote<T>(VoteType voteType)
{
return votes[(int)voteType];
return (votes[(int)voteType] is T) ? (T)votes[(int)voteType] : default(T);
}
public void SetVote(VoteType voteType, object value)
{
votes[(int)voteType] = value;
}
public void ResetVotes()
{
for (int i = 0; i<votes.Length; i++)
{
votes[i] = null;
}
}
}
}