Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use the number of controllers to get the number of spawned bots

Browse source
This commit is contained in:
smallmodel 2025-01-16 22:27:51 +01:00
parent a6d9369204
commit 95e72dd339
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
code/fgame/g_bot.cpp
View file

@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
static saved_bot_t *saved_bots = NULL; static saved_bot_t *saved_bots = NULL;
static unsigned int num_saved_bots = 0; static unsigned int num_saved_bots = 0;
static unsigned int current_bot_count = 0;
static unsigned int botId = 0; static unsigned int botId = 0;
Container<str> alliedModelList; Container<str> alliedModelList;
@ -438,7 +437,6 @@ void G_AddBot(const saved_bot_t *saved)
clientNum = e - g_entities; clientNum = e - g_entities;
current_bot_count++;
// increase the unique ID // increase the unique ID
botId++; botId++;
@ -504,7 +502,6 @@ void G_RemoveBot(gentity_t *ent)
} }
G_ClientDisconnect(ent); G_ClientDisconnect(ent);
current_bot_count--;
} }
/* /*
@ -583,17 +580,19 @@ void G_SaveBots()
saved_bots = NULL; saved_bots = NULL;
} }
if (!current_bot_count) { const BotControllerManager& manager = botManager.getControllerManager();
unsigned int numSpawnedBots = manager.getControllers().NumObjects();
if (!numSpawnedBots) {
return; return;
} }
saved_bots = new saved_bot_t[current_bot_count]; saved_bots = new saved_bot_t[numSpawnedBots];
num_saved_bots = 0; num_saved_bots = 0;
const BotControllerManager& manager = botManager.getControllerManager();
count = manager.getControllers().NumObjects(); count = manager.getControllers().NumObjects();
assert(count <= current_bot_count); assert(count <= numSpawnedBots);
for (n = 1; n <= count; n++) { for (n = 1; n <= count; n++) {
const BotController *controller = manager.getControllers().ObjectAt(n); const BotController *controller = manager.getControllers().ObjectAt(n);
@ -700,8 +699,7 @@ void G_ResetBots()
botManager.Cleanup(); botManager.Cleanup();
current_bot_count = 0; botId = 0;
botId = 0;
} }
/* /*
@ -754,6 +752,7 @@ void G_SpawnBots()
{ {
unsigned int numClients; unsigned int numClients;
unsigned int numBotsToSpawn; unsigned int numBotsToSpawn;
unsigned int numSpawnedBots;
// //
// Check the minimum bot count // Check the minimum bot count
@ -776,12 +775,14 @@ void G_SpawnBots()
numBotsToSpawn = Q_min(numBotsToSpawn, sv_maxbots->integer); numBotsToSpawn = Q_min(numBotsToSpawn, sv_maxbots->integer);
} }
numSpawnedBots = botManager.getControllerManager().getControllers().NumObjects();
// //
// Spawn bots // Spawn bots
// //
if (numBotsToSpawn > current_bot_count) { if (numBotsToSpawn > numSpawnedBots) {
G_AddBots(numBotsToSpawn - current_bot_count); G_AddBots(numBotsToSpawn - numSpawnedBots);
} else if (numBotsToSpawn < current_bot_count) { } else if (numBotsToSpawn < numSpawnedBots) {
G_RemoveBots(current_bot_count - numBotsToSpawn); G_RemoveBots(numSpawnedBots - numBotsToSpawn);
} }
} }