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

fixes clang warnings

Browse source 
fixed bad combat strafe dir direction selection
added more 'shoot thru wall' code as reaction on sound
This commit is contained in:
jeefo 2016-03-09 22:34:24 +03:00
commit 4b0188222f
8 changed files with 68 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/combat.cpp
View file

@ -1112,18 +1112,18 @@ void Bot::CombatFight (void)
m_combatStrafeDir = STRAFE_DIR_RIGHT;
if (Random.Long (1, 100) < 30)
m_combatStrafeDir == STRAFE_DIR_LEFT ? STRAFE_DIR_RIGHT : STRAFE_DIR_LEFT;
m_combatStrafeDir = (m_combatStrafeDir == STRAFE_DIR_LEFT ? STRAFE_DIR_RIGHT : STRAFE_DIR_LEFT);
m_strafeSetTime = engine.Time () + Random.Float (1.5f, 3.0f);
m_strafeSetTime = engine.Time () + Random.Float (0.5f, 3.0f);
}
if (m_combatStrafeDir == STRAFE_DIR_LEFT)
if (m_combatStrafeDir == STRAFE_DIR_RIGHT)
{
if (!CheckWallOnLeft ())
m_strafeSpeed = -pev->maxspeed;
else
{
m_combatStrafeDir == STRAFE_DIR_LEFT ? STRAFE_DIR_RIGHT : STRAFE_DIR_LEFT;
m_combatStrafeDir = STRAFE_DIR_LEFT;
m_strafeSetTime = engine.Time () + 1.5f;
}
}
@ -1133,7 +1133,7 @@ void Bot::CombatFight (void)
m_strafeSpeed = pev->maxspeed;
else
{
m_combatStrafeDir == STRAFE_DIR_LEFT ? STRAFE_DIR_RIGHT : STRAFE_DIR_LEFT;
m_combatStrafeDir = STRAFE_DIR_RIGHT;
m_strafeSetTime = engine.Time () + 1.5f;
}
}