From 1a24034b050db7666542318cb8771da9f3942695 Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Tue, 16 Oct 2018 01:39:08 +1100 Subject: [PATCH] damage feed object only shown if player is not in a vehicle --- .../irresistible/cnr/features/damage_feed.pwn | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/damage_feed.pwn b/gamemodes/irresistible/cnr/features/damage_feed.pwn index 8670b7c..dbb4cd7 100644 --- a/gamemodes/irresistible/cnr/features/damage_feed.pwn +++ b/gamemodes/irresistible/cnr/features/damage_feed.pwn @@ -209,15 +209,18 @@ public OnPlayerTakenDamage( playerid, issuerid, Float: amount, weaponid, bodypar if ( GetPlayerArmour( playerid, armour ) ) { + // reset damage object for player DestroyObject( p_DamageObject[ playerid ] ); + p_DamageObject[ playerid ] = -1; - p_DamageObject[ playerid ] = CreateObject( armour - amount <= 0.0 ? ( 1240 ) : ( 1242 ), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0 ); - AttachObjectToPlayer( p_DamageObject[ playerid ], playerid, 0.0, 0.0, 1.5, 0.0, 0.0, 0.0 ); + // show damage object if the player is not in a vehicle (otherwise their heli explodes) + if ( ! IsPlayerInAnyVehicle( playerid ) ) { + p_DamageObject[ playerid ] = CreateObject( armour - amount <= 0.0 ? ( 1240 ) : ( 1242 ), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0 ); + AttachObjectToPlayer( p_DamageObject[ playerid ], playerid, 0.0, 0.0, 1.5, 0.0, 0.0, 0.0 ); + SetTimerEx( "HideDamageObject", 1000, false, "d", playerid ); + } - //SetPlayerAttachedObject( playerid, 4, armour - amount <= 0.0 ? ( 1240 ) : ( 1242 ), 1, 1.400000, -0.004999, 0.034999, 4.499999, 83.500030, -3.799998, 1.000000, 1.000000, 1.026999 ); - SetTimerEx( "HideDamageObject", 1000, false, "d", playerid ); - - //Streamer_Update( playerid, STREAMER_TYPE_OBJECT ); + // mark player as hit p_GotHit{ playerid } = true; } }