From bc34211e438823c3b18077583a0f9e649a3bcd43 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Thu, 1 Jun 2023 21:09:18 -0500 Subject: [PATCH] more game interface gsc tweaks --- GameFiles/GameInterface/_integration_base.gsc | 2 +- GameFiles/GameInterface/_integration_iw4x.gsc | 2 +- GameFiles/GameInterface/_integration_shared.gsc | 2 +- GameFiles/GameInterface/_integration_t5zm.gsc | 2 ++ GameFiles/GameInterface/_integration_t6.gsc | 6 ++++++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/GameFiles/GameInterface/_integration_base.gsc b/GameFiles/GameInterface/_integration_base.gsc index 3c4aa0c07..6ff020844 100644 --- a/GameFiles/GameInterface/_integration_base.gsc +++ b/GameFiles/GameInterface/_integration_base.gsc @@ -71,7 +71,7 @@ Setup() _SetDvarIfUninitialized( level.commonKeys.enabled, 1 ); _SetDvarIfUninitialized( "sv_iw4madmin_integration_debug", 0 ); - if ( GetDvarInt( level.commonKeys.enabled) != 1 ) + if ( GetDvarInt( level.commonKeys.enabled ) != 1 ) { return; } diff --git a/GameFiles/GameInterface/_integration_iw4x.gsc b/GameFiles/GameInterface/_integration_iw4x.gsc index bfa1ce0b3..71f9454ef 100644 --- a/GameFiles/GameInterface/_integration_iw4x.gsc +++ b/GameFiles/GameInterface/_integration_iw4x.gsc @@ -10,7 +10,7 @@ Setup() level endon( "game_ended" ); waittillframeend; - level waittill( level.notifyTypes.sharedFunctionsInitialized ); + level waittill( level.notifyTypes.sharedFunctionsInitialized ); level.eventBus.gamename = "IW4"; scripts\_integration_base::RegisterLogger( ::Log2Console ); diff --git a/GameFiles/GameInterface/_integration_shared.gsc b/GameFiles/GameInterface/_integration_shared.gsc index aa517b6b8..be81e2daa 100644 --- a/GameFiles/GameInterface/_integration_shared.gsc +++ b/GameFiles/GameInterface/_integration_shared.gsc @@ -230,7 +230,7 @@ OnPlayerJoinedTeam() if ( newTeam != level.commonKeys.team1 && newTeam != level.commonKeys.team2 ) { OnTeamSizeChanged(); - scripts\_integration_base::LogDebug( "not force balancing " + self.name + " because they switched to spec" ); + scripts\_integration_base::LogDebug( "not force balancing " + self.name + " because they switched to spec" ); continue; } diff --git a/GameFiles/GameInterface/_integration_t5zm.gsc b/GameFiles/GameInterface/_integration_t5zm.gsc index e7d461e96..9a69d855a 100644 --- a/GameFiles/GameInterface/_integration_t5zm.gsc +++ b/GameFiles/GameInterface/_integration_t5zm.gsc @@ -8,9 +8,11 @@ Init() Setup() { level endon( "game_ended" ); + waittillframeend; level waittill( level.notifyTypes.sharedFunctionsInitialized ); level.eventBus.gamename = "T5"; + level.eventTypes.gameEnd = "end_game"; scripts\_integration_base::RegisterLogger( ::Log2Console ); diff --git a/GameFiles/GameInterface/_integration_t6.gsc b/GameFiles/GameInterface/_integration_t6.gsc index 3c5d578b1..18323bf83 100644 --- a/GameFiles/GameInterface/_integration_t6.gsc +++ b/GameFiles/GameInterface/_integration_t6.gsc @@ -9,10 +9,16 @@ Init() Setup() { level endon( "game_ended" ); + level endon( "end_game" ); waittillframeend; level waittill( level.notifyTypes.sharedFunctionsInitialized ); level.eventBus.gamename = "T6"; + + if ( sessionmodeiszombiesgame() ) + { + level.eventTypes.gameEnd = "end_game"; + } scripts\_integration_base::RegisterLogger( ::Log2Console );