moves hitmarkersound into damage_feed.pwn

cleanup
This commit is contained in:
Steven Howard 2018-10-12 17:00:44 +01:00
parent 0250296b2b
commit bdb45e28d8
3 changed files with 6 additions and 4 deletions

View File

@ -39,6 +39,7 @@
#include "irresistible\cnr\features\fires.pwn" #include "irresistible\cnr\features\fires.pwn"
#include "irresistible\cnr\features\car_jacker.pwn" #include "irresistible\cnr\features\car_jacker.pwn"
#include "irresistible\cnr\features\damage_feed.pwn" #include "irresistible\cnr\features\damage_feed.pwn"
// disabled // disabled
// #include "irresistible\cnr\features\eastereggs.pwn" // #include "irresistible\cnr\features\eastereggs.pwn"

View File

@ -37,6 +37,10 @@ enum E_HITMARKER_SOUND
E_NAME[ 10 ], E_SOUND_ID, E_NAME[ 10 ], E_SOUND_ID,
}; };
new
p_HitmarkerSound [ MAX_PLAYERS char ]
;
static stock static stock
g_damageGiven [ MAX_PLAYERS ][ MAX_FEED_HEIGHT ][ E_DAMAGE_FEED ], g_damageGiven [ MAX_PLAYERS ][ MAX_FEED_HEIGHT ][ E_DAMAGE_FEED ],
g_damageTaken [ MAX_PLAYERS ][ MAX_FEED_HEIGHT ][ E_DAMAGE_FEED ], g_damageTaken [ MAX_PLAYERS ][ MAX_FEED_HEIGHT ][ E_DAMAGE_FEED ],
@ -52,8 +56,6 @@ static stock
}, },
p_damageFeedTimer [ MAX_PLAYERS ] = { -1, ... }, p_damageFeedTimer [ MAX_PLAYERS ] = { -1, ... },
//p_DamageTDTimer [ MAX_PLAYERS ] = { -1, ... },
//bool: p_FeedActive [ MAX_PLAYERS char ],
p_lastFeedUpdate [ MAX_PLAYERS ] p_lastFeedUpdate [ MAX_PLAYERS ]
; ;

View File

@ -234,8 +234,7 @@ new
p_AimedAtPolice [ MAX_PLAYERS ], p_AimedAtPolice [ MAX_PLAYERS ],
bool: p_PassiveModeDisabled [ MAX_PLAYERS char ], bool: p_PassiveModeDisabled [ MAX_PLAYERS char ],
p_PassiveModeExpireTimer [ MAX_PLAYERS ] = { -1, ... }, p_PassiveModeExpireTimer [ MAX_PLAYERS ] = { -1, ... },
Text3D: p_PassiveModeLabel [ MAX_PLAYERS ] = { Text3D: INVALID_3DTEXT_ID }, Text3D: p_PassiveModeLabel [ MAX_PLAYERS ] = { Text3D: INVALID_3DTEXT_ID }
p_HitmarkerSound [ MAX_PLAYERS char ]
; ;
/* ** Getters And Setters** */ /* ** Getters And Setters** */