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

fix: bad maxspeed after respawn with csdm (ref #482)

Browse source 
fix: free for all mode has no friends or foes
chat: disable dead chat on csdm
This commit is contained in:
jeefo 2023-09-14 16:48:36 +03:00
commit 948b441541
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
11 changed files with 119 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/combat.cpp
View file

@ -17,6 +17,10 @@ ConVar mp_friendlyfire ("mp_friendlyfire", nullptr, Var::GameRef);
ConVar sv_gravity ("sv_gravity", nullptr, Var::GameRef);
int Bot::numFriendsNear (const Vector &origin, const float radius) {
if (game.is (GameFlags::FreeForAll)) {
return 0; // no friends on free for all mode
}
int count = 0;
const float radiusSq = cr::sqrf (radius);
@ -33,6 +37,10 @@ int Bot::numFriendsNear (const Vector &origin, const float radius) {
}
int Bot::numEnemiesNear (const Vector &origin, const float radius) {
if (game.is (GameFlags::FreeForAll)) {
return 0; // no enemies on free for all mode
}
int count = 0;
const float radiusSq = cr::sqrf (radius);
@ -372,7 +380,7 @@ bool Bot::lookupEnemies () {
// now alarm all teammates who see this bot & don't have an actual enemy of the bots enemy should simulate human players seeing a teammate firing
for (const auto &other : bots) {
if (!other->m_notKilled || other->m_team != m_team || other.get () == this) {
if (!other->m_isAlive || other->m_team != m_team || other.get () == this) {
continue;
}