aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2022-01-15 03:00:57 +0000
committerGitHub <noreply@github.com>2022-01-15 03:00:57 +0000
commitad0da9874efd3dd7a59100142d6f2b964797dda4 (patch)
treeca26896e52ffc454047ed179ba1dfe503350b3c5
parent3f7c13c0df67d1e80ffafa65f9fb6d87c38f4653 (diff)
parent3e3d8e84692d64d3acff8ef61de1347ec955890c (diff)
downloadNorthstarMods-ad0da9874efd3dd7a59100142d6f2b964797dda4.tar.gz
NorthstarMods-ad0da9874efd3dd7a59100142d6f2b964797dda4.zip
Merge pull request #119 from ASpoonPlaysGames/time-limit
GetTimeLimit_ForGameMode() is no longer a stub
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut6
1 files changed, 5 insertions, 1 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut
index 2d39cf2d8..e5c8799dd 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut
@@ -848,5 +848,9 @@ void function GiveTitanToPlayer( entity player )
float function GetTimeLimit_ForGameMode()
{
- return 100.0
+ string mode = GameRules_GetGameMode()
+ string playlistString = "timelimit"
+
+ // default to 10 mins, because that seems reasonable
+ return GetCurrentPlaylistVarFloat( playlistString, 10 )
} \ No newline at end of file