Respawn shuttle transport duration can be adjusted or set to unlimited (= shuttle won't leave after spawning), subs with the HideInMenus tag aren't shown in menus, respawn info msgs are shown to all players

This commit is contained in:
Regalis
2016-08-08 23:37:11 +03:00
parent d4338580c7
commit 70dd90f0f8
8 changed files with 64 additions and 49 deletions
+4 -10
View File
@@ -178,6 +178,9 @@ namespace Barotrauma.Networking
networkMember.AddChatMessage("The shuttle will automatically return back to the outpost. Please leave the shuttle immediately.", ChatMessageType.Server);
}
//infinite transport time -> shuttle wont return
if (maxTransportTime < 0.1f) return;
var server = networkMember as GameServer;
if (server == null) return;
@@ -196,15 +199,6 @@ namespace Barotrauma.Networking
shuttleReturnTimer = maxTransportTime;
shuttleTransportTimer = maxTransportTime;
}
//shuttleReturnTimer += deltaTime;
//if (shuttleReturnTimer > 10.0f)
//{
// state = State.Returning;
// server.SendRespawnManagerMsg();
// shuttleReturnTimer = 0.0f;
//}
}
private void UpdateReturning(float deltaTime)
@@ -477,7 +471,7 @@ namespace Barotrauma.Networking
CoroutineManager.StartCoroutine(ForceShuttleToPos(Level.Loaded.StartPosition - Vector2.UnitY * Level.ShaftHeight, 100.0f), "forcepos");
break;
case State.Waiting:
CountdownStarted = true;
CountdownStarted = inc.ReadBoolean();
ResetShuttle();