diff options
| author | Will Castro <39478251+VITALISED@users.noreply.github.com> | 2022-01-19 17:09:54 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 17:09:54 +1100 |
| commit | 9693b43e54659cf6049276ab66ca7cd59415460a (patch) | |
| tree | e1f3821c3242dba9833c688855abb5a74e6f606d /Northstar.Custom | |
| parent | 2b74dda6be49895652d02613d6cdd7093f8c6c45 (diff) | |
| parent | 72d1ab3492ea20ffb75a4d627b09bedd26df41a6 (diff) | |
| download | NorthstarMods-9693b43e54659cf6049276ab66ca7cd59415460a.tar.gz NorthstarMods-9693b43e54659cf6049276ab66ca7cd59415460a.zip | |
Merge branch 'main' into attributes-localisation
Diffstat (limited to 'Northstar.Custom')
| -rw-r--r-- | Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut | 6 | ||||
| -rw-r--r-- | Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_fastball.gnut | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut b/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut index e629e5ae..850855a0 100644 --- a/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/_northstar_devcommands.gnut @@ -23,7 +23,7 @@ bool function ClientCommandCallbackToggleNoclip( entity player, array<string> ar bool function ClientCommandCallbackKill( entity player, array<string> args ) { - if ( IsAlive( player ) && GetConVarInt( "sv_cheats" ) == 1 ) + if ( IsAlive( player ) ) player.Die() return true @@ -31,8 +31,8 @@ bool function ClientCommandCallbackKill( entity player, array<string> args ) bool function ClientCommandCallbackExplode( entity player, array<string> args ) { - if ( IsAlive( player ) && GetConVarInt( "sv_cheats" ) == 1 ) + if ( IsAlive( player ) ) player.Die( null, null, { scriptType = DF_GIB } ) return true -}
\ No newline at end of file +} 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() |