YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-12 07:58:05 +00:00
Code Issues Projects Releases Wiki Activity

Remove duplicate loop.

Browse Source
This commit is contained in:
Night Owl 2016-08-03 02:05:15 +05:00
parent 9e262a0e14
commit f614c73318
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cl_dll/health.cpp
View File

@ -125,7 +125,7 @@ int CHudHealth::MsgFunc_Damage( const char *pszName, int iSize, void *pbuf )
vec3_t vecFrom; vec3_t vecFrom;
for ( int i = 0; i < 3; i++ ) for( int i = 0; i < 3; i++ )
vecFrom[i] = READ_COORD(); vecFrom[i] = READ_COORD();
UpdateTiles( gHUD.m_flTime, bitsDamage ); UpdateTiles( gHUD.m_flTime, bitsDamage );
@ -240,8 +240,8 @@ int CHudHealth::Draw( float flTime )
void CHudHealth::CalcDamageDirection( vec3_t vecFrom ) void CHudHealth::CalcDamageDirection( vec3_t vecFrom )
{ {
vec3_t forward, right, up; vec3_t forward, right, up;
float side, front; float side, front;
vec3_t vecOrigin, vecAngles; vec3_t vecOrigin, vecAngles;
if( !vecFrom[0] && !vecFrom[1] && !vecFrom[2] ) if( !vecFrom[0] && !vecFrom[1] && !vecFrom[2] )
@ -376,26 +376,15 @@ int CHudHealth::DrawDamage( float flTime )
int i, r, g, b, a; int i, r, g, b, a;
DAMAGE_IMAGE *pdmg; DAMAGE_IMAGE *pdmg;
if (!m_bitsDamage) if( !m_bitsDamage )
return 1; return 1;
UnpackRGB( r, g, b, RGB_YELLOWISH ); UnpackRGB( r, g, b, RGB_YELLOWISH );
a = (int)( fabs( sin( flTime * 2 ) ) * 256.0); a = (int)( fabs( sin( flTime * 2 ) ) * 256.0 );
ScaleColors( r, g, b, a ); ScaleColors( r, g, b, a );
// Draw all the items
for( i = 0; i < NUM_DMG_TYPES; i++ )
{
if (m_bitsDamage & giDmgFlags[i])
{
pdmg = &m_dmg[i];
SPR_Set(gHUD.GetSprite(m_HUD_dmg_bio + i), r, g, b );
SPR_DrawAdditive(0, pdmg->x, pdmg->y, &gHUD.GetSpriteRect(m_HUD_dmg_bio + i));
}
}
// check for bits that should be expired // check for bits that should be expired
for( i = 0; i < NUM_DMG_TYPES; i++ ) for( i = 0; i < NUM_DMG_TYPES; i++ )
{ {
@ -403,6 +392,10 @@ int CHudHealth::DrawDamage( float flTime )
{ {
pdmg = &m_dmg[i]; pdmg = &m_dmg[i];
// Draw all the items
SPR_Set( gHUD.GetSprite( m_HUD_dmg_bio + i ), r, g, b );
SPR_DrawAdditive( 0, pdmg->x, pdmg->y, &gHUD.GetSpriteRect( m_HUD_dmg_bio + i ) );
pdmg->fExpire = min( flTime + DMG_IMAGE_LIFE, pdmg->fExpire ); pdmg->fExpire = min( flTime + DMG_IMAGE_LIFE, pdmg->fExpire );
if( pdmg->fExpire <= flTime // when the time has expired if( pdmg->fExpire <= flTime // when the time has expired