From f8c6d1c61e7af94446efe64cf97a652018dbc7fa Mon Sep 17 00:00:00 2001 From: efinst0rm Date: Wed, 23 Aug 2023 22:36:40 -0500 Subject: [PATCH] Fixed audio cues on kill confirmed. --- iw4x/iw4x_00/maps/mp/gametypes/conf.gsc | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/iw4x/iw4x_00/maps/mp/gametypes/conf.gsc b/iw4x/iw4x_00/maps/mp/gametypes/conf.gsc index b35ad06..b67c725 100644 --- a/iw4x/iw4x_00/maps/mp/gametypes/conf.gsc +++ b/iw4x/iw4x_00/maps/mp/gametypes/conf.gsc @@ -46,10 +46,7 @@ main() level.onNormalDeath = ::onNormalDeath; level.onPrecacheGameType = ::onPrecacheGameType; - //game["dialog"]["gametype"] = "kill_confirmed"; - - //level.conf_vo["axis"] = "RU_1mc_kill_confirmed"; - //level.conf_vo["allies"] = "US_1mc_kill_confirmed"; + game["dialog"]["gametype"] = "kill_confirmed"; level.conf_fx["vanish"] = loadFx( "impacts/small_snowhit" ); } @@ -244,18 +241,6 @@ showToTeam( gameObject, team ) onUse( player ) { - pos = self.curOrigin; - - self notify( "reset" ); - self.visuals[0] hide(); - self.visuals[1] hide(); - self.curOrigin = (0,0,1000); - self.trigger.origin = (0,0,1000); - self.visuals[0].origin = (0,0,1000); - self.visuals[1].origin = (0,0,1000); - self maps\mp\gametypes\_gameobjects::allowUse( "none" ); - objective_state( self.objId, "invisible" ); - // friendly pickup if ( player.pers["team"] == self.victimTeam ) { @@ -274,7 +259,7 @@ onUse( player ) // tell the attacker their kill was denied if ( isDefined( self.attacker ) ) - self.attacker thread EventPopup( &"SPLASHES_DENIED_KILL", (1,0.5,0.5) ); + self.attacker thread EventPopup( &"SPLASHES_DENIED_KILL", ( 1,0.5,0.5) ); } // enemy pickup else @@ -288,7 +273,7 @@ onUse( player ) if ( self.attacker != player ) self.attacker onPickup( event, splash ); - player playLocalSound( game["voice"][player.pers["team"]] + "kill_confirmed" ); + self.trigger playSoundToPlayer( game["voice"][player.pers["team"]] + "kill_confirmed", player ); player maps\mp\gametypes\_gamescore::giveTeamScoreForObjective( player.pers["team"], 1 ); }