markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed typo in checkreload

Browse source
This commit is contained in:
jeefo 2015-08-03 21:08:38 +03:00
commit 29aa353d5e
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
source/combat.cpp
View file

@ -1673,10 +1673,11 @@ void Bot::CheckReload (void)
break; break;
} }
if (m_ammoInClip[weaponIndex] < (maxClip * 0.8) && g_weaponDefs[m_currentWeapon].ammo1 != -1 && g_weaponDefs[m_currentWeapon].ammo1 < 32 && m_ammo[g_weaponDefs[weaponIndex].ammo1] > 0) if (m_ammoInClip[weaponIndex] < maxClip * 0.8 && g_weaponDefs[weaponIndex].ammo1 != -1 && g_weaponDefs[weaponIndex].ammo1 < 32 && m_ammo[g_weaponDefs[weaponIndex].ammo1] > 0)
{ {
if (m_currentWeapon != weaponIndex) if (m_currentWeapon != weaponIndex)
SelectWeaponByName (g_weaponDefs[weaponIndex].className); SelectWeaponByName (g_weaponDefs[weaponIndex].className);
pev->button &= ~IN_ATTACK; pev->button &= ~IN_ATTACK;
if ((pev->oldbuttons & IN_RELOAD) == RELOAD_NONE) if ((pev->oldbuttons & IN_RELOAD) == RELOAD_NONE)
@ -1687,7 +1688,7 @@ void Bot::CheckReload (void)
else else
{ {
// if we have enemy don't reload next weapon // if we have enemy don't reload next weapon
if ((m_states & (STATE_SEEING_ENEMY | STATE_HEARING_ENEMY)) || m_seeEnemyTime + 5.0 > GetWorldTime ()) if ((m_states & (STATE_SEEING_ENEMY | STATE_HEARING_ENEMY)) || m_seeEnemyTime + 5.0f > GetWorldTime ())
{ {
m_reloadState = RELOAD_NONE; m_reloadState = RELOAD_NONE;
return; return;

4
source/netmsg.cpp
View file

@ -119,10 +119,6 @@ void NetworkMsg::Execute (void *p)
break; break;
case 8: case 8:
if (weaponProp.ammo1 > 31)
weaponProp.ammo1 = -1;
weaponProp.flags = PTR_TO_INT (p); // flags for weapon (WTF???) weaponProp.flags = PTR_TO_INT (p); // flags for weapon (WTF???)
g_weaponDefs[weaponProp.id] = weaponProp; // store away this weapon with it's ammo information... g_weaponDefs[weaponProp.id] = weaponProp; // store away this weapon with it's ammo information...
break; break;