From 72aa12e04b0e01f33fd3d89db10992aeaa7dfcd0 Mon Sep 17 00:00:00 2001 From: Connie Price Date: Fri, 21 Jan 2022 03:23:48 +0000 Subject: Some extra earn meter cleanup. - Fixed `sh_gg_earn_meter.gnut` when used in multiple gamemodes. - Removed some unnecessary functions from `cl_gg_earn_meter.gnut`. --- .../gamemodes/gg_earn_meter/sh_gg_earn_meter.gnut | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'Northstar.Custom/mod/scripts/vscripts/gamemodes/gg_earn_meter/sh_gg_earn_meter.gnut') diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/gg_earn_meter/sh_gg_earn_meter.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/gg_earn_meter/sh_gg_earn_meter.gnut index a1dbb75a4..2eba4eee2 100644 --- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/gg_earn_meter/sh_gg_earn_meter.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/gg_earn_meter/sh_gg_earn_meter.gnut @@ -2,25 +2,29 @@ global function Sh_GGEarnMeter_Init struct { - string gamemode = "" + bool callbackAdded = false + array gamemodes } file void function Sh_GGEarnMeter_Init(string gamemode) { - file.gamemode = gamemode + file.gamemodes.append(gamemode) - AddCallback_OnRegisteringCustomNetworkVars( RegisterSharedNetwork ) + if ( !file.callbackAdded ) + { + file.callbackAdded = true + AddCallback_OnRegisteringCustomNetworkVars( RegisterSharedNetwork ) + } } void function RegisterSharedNetwork() { - if ( GAMETYPE != file.gamemode ) - return + if ( !( file.gamemodes.contains(GAMETYPE) ) ) + return RegisterNetworkedVariable( "gunGameLevelPercentage", SNDC_PLAYER_EXCLUSIVE, SNVT_FLOAT_RANGE, 0.0, 0.0, 1.0 ) - Remote_RegisterFunction( "ServerCallback_GGEarnMeter_SetWeaponIcon" ) - #if CLIENT - Cl_GGEarnMeter_RegisterNetwork() - #endif + #if CLIENT + Cl_GGEarnMeter_RegisterNetwork() + #endif } \ No newline at end of file -- cgit v1.2.3