ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changing functions for given/taken feed

Browse Source
This commit is contained in:
Steven Howard 2018-10-11 16:36:56 +01:00
parent 45dcae630d
commit 110458523d
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gamemodes/irresistible/cnr/features/damage_feed.pwn
View File

@ -138,9 +138,10 @@ public OnPlayerTakenDamage( playerid, issuerid, Float: amount, weaponid, bodypar
/* ** Damage Feed ** */ /* ** Damage Feed ** */
if ( issuerid != INVALID_PLAYER_ID ) { if ( issuerid != INVALID_PLAYER_ID ) {
AddDamageFeedHit( issuerid, playerid, amount, weaponid, TYPE_GIVEN ); DamageFeedAddHitGiven( issuerid, playerid, amount, weaponid );
} }
AddDamageFeedHit( playerid, issuerid, amount, weaponid, TYPE_TAKEN );
DamageFeedAddHitTaken( playerid, issuerid, amount, weaponid );
return 1; return 1;
} }
@ -155,6 +156,24 @@ public OnPlayerFeedUpdate( playerid )
return 1; return 1;
} }
stock DamageFeedAddHitGiven( playerid, issuerid, Float: amount, weaponid )
{
foreach( new i : Player ) if ( i != playerid ) {
AddDamageHit( g_damageGiven[ i ], i, issuerid, amount, weaponid );
}
AddDamageHit( g_damageGiven[ playerid ], playerid, issuerid, amount, weaponid );
}
stock DamageFeedAddHitTaken( playerid, issuerid, Float: amount, weaponid )
{
foreach( new i : Player ) if ( i != playerid ) {
AddDamageHit( g_damageTaken[ i ], i, issuerid, amount, weaponid );
}
AddDamageHit( g_damageTaken[ playerid ], playerid, issuerid, amount, weaponid );
}
stock UpdateDamageFeed( playerid, bool: modified = false ) stock UpdateDamageFeed( playerid, bool: modified = false )
{ {
if ( !IsDamageFeedActive( playerid ) ) if ( !IsDamageFeedActive( playerid ) )
@ -311,11 +330,11 @@ stock UpdateDamageFeedLabel( playerid )
if ( g_damageGiven[ playerid ][ givenid ][ E_ISSUER ] == INVALID_PLAYER_ID ) if ( g_damageGiven[ playerid ][ givenid ][ E_ISSUER ] == INVALID_PLAYER_ID )
{ {
format( szLabel, sizeof( szLabel ), "%s~g~~h~%s ~w~+%.2f~n~", szLabel, szWeapon, g_damageGiven[ playerid ][ givenid ][ E_AMOUNT ] + 0.009 ); format( szLabel, sizeof( szLabel ), "%s~g~~h~%s ~w~+%.2f~n~", szLabel, szWeapon, g_damageGiven[ playerid ][ givenid ][ E_AMOUNT ] );
} }
else else
{ {
format( szLabel, sizeof( szLabel ), "%s~g~~h~%s - %s ~w~+%.2f~n~", szLabel, szWeapon, g_damageGiven[ playerid ][ givenid ][ E_NAME ], g_damageGiven[ playerid ][ givenid ][ E_AMOUNT ] + 0.009 ); format( szLabel, sizeof( szLabel ), "%s~g~~h~%s - %s ~w~+%.2f~n~", szLabel, szWeapon, g_damageGiven[ playerid ][ givenid ][ E_NAME ], g_damageGiven[ playerid ][ givenid ][ E_AMOUNT ] );
} }
} }
@ -437,26 +456,6 @@ stock AddDamageHit( array[ MAX_FEED_HEIGHT ][ E_DAMAGE_FEED ], playerid, issueri
UpdateDamageFeed( playerid, true ); UpdateDamageFeed( playerid, true );
} }
stock AddDamageFeedHit( playerid, issuerid, Float: amount, weaponid, type )
{
if ( type == TYPE_GIVEN )
{
foreach( new i : Player ) if ( i != playerid) {
AddDamageHit( g_damageGiven[ i ], i, issuerid, amount, weaponid );
}
AddDamageHit( g_damageGiven[ playerid ], playerid, issuerid, amount, weaponid );
}
else if ( type == TYPE_TAKEN )
{
foreach( new i : Player ) if ( i != playerid) {
AddDamageHit( g_damageTaken[ i ], i, issuerid, amount, weaponid );
}
AddDamageHit( g_damageTaken[ playerid ], playerid, issuerid, amount, weaponid );
}
}
stock ShowSoundsMenu( playerid ) stock ShowSoundsMenu( playerid )
{ {
static static