unknownworlds/ns
0
0
Fork 0
mirror of https://github.com/unknownworlds/NS.git synced 2024-11-29 15:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed MsgFunc_CurWeapon bugs

Browse source 
git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@30 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
XP-Cagey 2005-04-04 00:53:17 +00:00
parent 6eca2b6cc9
commit 2a96942bc4
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
main/source/cl_dll/ammo.cpp
View file

@ -667,13 +667,11 @@ int CHudAmmo::MsgFunc_CurWeapon(const char *pszName, int iSize, void *pbuf )
if ( iId < 1 ) //signal kills crosshairs if this condition is met...
{
gHUD.SetCurrentCrosshair(0, nullrc, 0, 0, 0);
//previous version had return 0 here, so
//check for dead player below would never
//be reached.
return 0;
}
bool bOnTarget = (iState && WEAPON_ON_TARGET); //used to track autoaim state
bool bIsCurrent = (iState && WEAPON_IS_CURRENT);
bool bOnTarget = (iState & WEAPON_ON_TARGET) != 0; //used to track autoaim state
bool bIsCurrent = (iState & WEAPON_IS_CURRENT) != 0;
if ( g_iUser1 != OBS_IN_EYE )
{
@ -687,16 +685,16 @@ int CHudAmmo::MsgFunc_CurWeapon(const char *pszName, int iSize, void *pbuf )
gHUD.m_fPlayerDead = FALSE;
}
if( !bIsCurrent )
{ return 1; }
WEAPON *pWeapon = gWR.GetWeapon( iId );
if( pWeapon == NULL ) //don't have the weapon described in our resource list
{ return 0; }
m_pWeapon = pWeapon;
m_pWeapon->iEnabled = (iState && WEAPON_IS_ENABLED) ? TRUE : FALSE;
m_pWeapon->iClip = abs(iClip);
m_pWeapon->iEnabled = (iState & WEAPON_IS_ENABLED) ? TRUE : FALSE;
m_pWeapon->iClip = iClip;
if( !bIsCurrent )
{ return 1; }
if ( !(gHUD.m_iHideHUDDisplay & ( HIDEHUD_WEAPONS | HIDEHUD_ALL )) )
{