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

fixed bot's don't shoot at near-zero distance [need testing]

Browse source
This commit is contained in:
jeefo 2016-01-26 21:18:59 +03:00
commit e9d826ccea
4 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/core.h
View file

@ -1431,11 +1431,6 @@ public:
m_deathMsgSent = sent;
}
inline bool GetDeathMsgState (void)
{
return m_deathMsgSent;
}
// grenades
void UpdateActiveGrenades (void);
const Array <entity_t> &GetActiveGrenades (void);

4
source/combat.cpp
View file

@ -1002,11 +1002,11 @@ void Bot::FocusEnemy (void)
{
if (m_currentWeapon == WEAPON_KNIFE)
{
if (distance <= 80.0f)
if (distance < 80.0f)
m_wantsToFire = true;
}
else
m_wantsToFire = GetShootingConeDeviation (GetEntity (), &m_enemyOrigin) > 0.8f;
m_wantsToFire = true;
}
else
{

10
source/manager.cpp
View file

@ -1423,16 +1423,16 @@ void BotManager::SendPingDataOffsets (edict_t *to)
{
// start a new message
MESSAGE_BEGIN (MSG_ONE_UNRELIABLE, SVC_PINGS, NULL, to);
WRITE_BYTE ((m_bots[i]->m_pingOffset[sending] * 64) + (1 + 2 * i));
WRITE_SHORT (m_bots[i]->m_ping[sending]);
WRITE_BYTE ((bot->m_pingOffset[sending] * 64) + (1 + 2 * i));
WRITE_SHORT (bot->m_ping[sending]);
sending++;
}
case 1:
{
// append additional data
WRITE_BYTE ((m_bots[i]->m_pingOffset[sending] * 128) + (2 + 4 * i));
WRITE_SHORT (m_bots[i]->m_ping[sending]);
WRITE_BYTE ((bot->m_pingOffset[sending] * 128) + (2 + 4 * i));
WRITE_SHORT (bot->m_ping[sending]);
sending++;
}
@ -1440,7 +1440,7 @@ void BotManager::SendPingDataOffsets (edict_t *to)
{
// append additional data and end message
WRITE_BYTE (4 + 8 * i);
WRITE_SHORT (m_bots[i]->m_ping[sending]);
WRITE_SHORT (bot->m_ping[sending]);
WRITE_BYTE (0);
MESSAGE_END ();

4
source/netmsg.cpp
View file

@ -312,9 +312,9 @@ void NetworkMsg::Execute (void *p)
if (target != NULL)
{
if (GetTeam (killer) == GetTeam (victim))
target->m_voteKickIndex = killerIndex;
target->m_voteKickIndex = killerIndex;
target->m_notKilled = false;
target->m_notKilled = false;
}
}
}