aboutsummaryrefslogtreecommitdiff
path: root/Northstar.Custom/mod/scripts/vscripts/gamemodes
diff options
context:
space:
mode:
authorWill Castro <39478251+VITALISED@users.noreply.github.com>2022-01-19 17:09:54 +1100
committerGitHub <noreply@github.com>2022-01-19 17:09:54 +1100
commit9693b43e54659cf6049276ab66ca7cd59415460a (patch)
treee1f3821c3242dba9833c688855abb5a74e6f606d /Northstar.Custom/mod/scripts/vscripts/gamemodes
parent2b74dda6be49895652d02613d6cdd7093f8c6c45 (diff)
parent72d1ab3492ea20ffb75a4d627b09bedd26df41a6 (diff)
downloadNorthstarMods-9693b43e54659cf6049276ab66ca7cd59415460a.tar.gz
NorthstarMods-9693b43e54659cf6049276ab66ca7cd59415460a.zip
Merge branch 'main' into attributes-localisation
Diffstat (limited to 'Northstar.Custom/mod/scripts/vscripts/gamemodes')
-rw-r--r--Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_fastball.gnut6
1 files changed, 3 insertions, 3 deletions
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_fastball.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_fastball.gnut
index b7c225c7..f64658cf 100644
--- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_fastball.gnut
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_fastball.gnut
@@ -68,7 +68,7 @@ void function ServerCallback_FastballPanelHacked( int panelHandle, int id, int c
AnnouncementData announcement = Announcement_Create( Localize( "#FASTBALL_PANEL_CAPTURED", capturingPlayer.GetPlayerName(), panelIdString ) )
- if ( capturingPlayer.GetTeam() == GetLocalViewPlayer().GetTeam() )
+ if ( capturingPlayer.GetTeam() == GetLocalClientPlayer().GetTeam() )
Announcement_SetTitleColor( announcement, < 0, 0, 1 > )
else
Announcement_SetTitleColor( announcement, < 1, 0, 0 > )
@@ -77,7 +77,7 @@ void function ServerCallback_FastballPanelHacked( int panelHandle, int id, int c
Announcement_SetPriority( announcement, 200 ) //Be higher priority than Titanfall ready indicator etc
Announcement_SetSoundAlias( announcement, SFX_HUD_ANNOUNCE_QUICK )
Announcement_SetStyle( announcement, ANNOUNCEMENT_STYLE_QUICK )
- AnnouncementFromClass( GetLocalViewPlayer(), announcement )
+ AnnouncementFromClass( GetLocalClientPlayer(), announcement )
}
void function ServerCallback_FastballRespawnPlayer()
@@ -88,7 +88,7 @@ void function ServerCallback_FastballRespawnPlayer()
void function FastballRespawnPlayerEffects_Threaded()
{
// sometimes this seems to get called before the player has respawned clientside, so we just wait until the client thinks they're alive
- entity player = GetLocalViewPlayer()
+ entity player = GetLocalClientPlayer()
while ( !IsAlive( player ) )
WaitFrame()