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

Fixed bad behaviour of A_stricmp, that caused incorrent parsing of bot console commands.

Browse source 
Fixed chatter icon and message notification left on screen if bot was kicked during communication.

Removed yb_csdm_mode. Bot's will automatically know whether they are running under csdm or csdm ffa.

Refactored game-message enums for readability.

Updated yapb.cfg to be actual with code-current bot variables.
This commit is contained in:
jeefo 2016-10-23 01:49:05 +03:00
commit ceb0f43377
8 changed files with 91 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

5
source/combat.cpp
View file

@ -11,7 +11,6 @@
ConVar yb_shoots_thru_walls ("yb_shoots_thru_walls", "2");
ConVar yb_ignore_enemies ("yb_ignore_enemies", "0");
ConVar yb_csdm_mode ("yb_csdm_mode", "0");
ConVar yb_check_enemy_rendering ("yb_check_enemy_rendering", "0");
ConVar mp_friendlyfire ("mp_friendlyfire", nullptr, VT_NOREGISTER);
@ -559,7 +558,7 @@ float Bot::GetZOffset (float distance)
bool Bot::IsFriendInLineOfFire (float distance)
{
// bot can't hurt teammates, if friendly fire is not enabled...
if (!mp_friendlyfire.GetBool () || yb_csdm_mode.GetInt () > 0)
if (!mp_friendlyfire.GetBool () || (g_gameFlags & GAME_CSDM))
return false;
MakeVectors (pev->v_angle);
@ -1470,7 +1469,7 @@ void Bot::AttachToUser (void)
void Bot::CommandTeam (void)
{
// prevent spamming
if (m_timeTeamOrder > engine.Time () + 2 || yb_csdm_mode.GetInt () == 2 || yb_communication_type.GetInt () == 0)
if (m_timeTeamOrder > engine.Time () + 2.0f || (g_gameFlags & GAME_CSDM_FFA) || !yb_communication_type.GetInt ())
return;
bool memberNear = false;