aboutsummaryrefslogtreecommitdiff
path: root/Northstar.Custom
diff options
context:
space:
mode:
Diffstat (limited to 'Northstar.Custom')
-rw-r--r--Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut6
-rw-r--r--Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut2
2 files changed, 6 insertions, 2 deletions
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut
index 5f2e6adcd..2a137744a 100644
--- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut
@@ -107,6 +107,12 @@ void function AnimateBuddy( entity buddy )
buddy.WaitSignal( "fastball_release" )
wait 5.0
+
+ // clear any players off bt to avoid potential crash which can supposedly happen even though i've never seen it happen
+ foreach ( entity player in GetPlayerArray() )
+ if ( player.GetParent() == buddy )
+ player.ClearParent()
+
buddy.Destroy()
}
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut
index 8c6e3f635..ca238d5d9 100644
--- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_fw_custom.nut
@@ -13,8 +13,6 @@ void function SHCreateGamemodeFW_Init()
void function CreateGamemodeFW()
{
- //entity e = CreateEntity("npc_turret_mega"); SetAISettingsWrapper( e, "npc_turret_mega_fortwar" ); e.SetOrigin(GetPlayerArray()[0].GetOrigin()); SetTeam(e,3); DispatchSpawn(e)
-
// we have to manually add the client/shared scripts to scripts.rson atm so we need to prevent compile errors when they aren't included
// best way to do this is to just ignore this whole block for now and wait until we don't have to add them manually