- Changes in UpdateNetPlayerPosition

- Holdable items don't try to change the pose if hand anim is disabled (e.g. when dragging someone or using a railgun controller)
- Indicator which shows the position of the sub when spectating
- Bugfix in controller selection logic
- Saving attributes on separate lines in serversettings.xml
- Safer validation of received sub files
This commit is contained in:
Regalis
2016-02-28 14:33:03 +02:00
parent cc4ada952f
commit 00c1edad09
18 changed files with 181 additions and 93 deletions
+8 -7
View File
@@ -846,6 +846,14 @@ namespace Barotrauma.Networking
return false;
}
if (ConnectedClients.Any(c => c.FileStreamSender != null && c.FileStreamSender.FilePath == selectedSub.FilePath))
{
new GUIMessageBox("Couldn't start a round",
"Can't start a round while sending the selected submarine to clients. Cancel the transfers or wait for them to finish before starting.", 400, 400);
return false;
}
GameMain.ShowLoading(StartGame(selectedSub, selectedMode), false);
return true;
@@ -855,13 +863,6 @@ namespace Barotrauma.Networking
{
GUIMessageBox.CloseAll();
if (ConnectedClients.Any(c => c.FileStreamSender != null && c.FileStreamSender.FilePath == selectedSub.FilePath))
{
new GUIMessageBox("Couldn't start a round",
"Can't start a round while sending the selected submarine to clients. Cancel the transfers or wait for them to finish before starting.", 400, 400);
yield return CoroutineStatus.Success;
}
AssignJobs();
roundStartSeed = DateTime.Now.Millisecond;