From c7efc3722739287a7e8719aea059fd32b1436e03 Mon Sep 17 00:00:00 2001 From: RGreenlees Date: Tue, 26 Mar 2024 23:00:55 +0000 Subject: [PATCH] Rever accidental change to Linux fix --- main/source/mod/AvHAIConfig.cpp | 2 +- main/source/mod/AvHAIPlayerManager.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main/source/mod/AvHAIConfig.cpp b/main/source/mod/AvHAIConfig.cpp index e03e1c80..28e29b54 100644 --- a/main/source/mod/AvHAIConfig.cpp +++ b/main/source/mod/AvHAIConfig.cpp @@ -160,7 +160,7 @@ void CONFIG_ParseConfigFile() while (getline(cFile, line)) { - line.erase(std::remove_if(line.begin(), line.end(), isspace), + line.erase(std::remove_if(line.begin(), line.end(), ::isspace), line.end()); if (line[0] == '#' || line.empty()) continue; diff --git a/main/source/mod/AvHAIPlayerManager.cpp b/main/source/mod/AvHAIPlayerManager.cpp index 99dec9d1..53d15960 100644 --- a/main/source/mod/AvHAIPlayerManager.cpp +++ b/main/source/mod/AvHAIPlayerManager.cpp @@ -360,22 +360,22 @@ void AIMGR_RemoveAIPlayerFromTeam(int Team) BotValue += 1000.0f; // Ensure this guy isn't kicked unless he's the only bot on the team! break; case PLAYERCLASS_ALIVE_HEAVY_MARINE: - BotValue += kHeavyArmorCost; + BotValue += BALANCE_VAR(kHeavyArmorCost); break; case PLAYERCLASS_ALIVE_JETPACK_MARINE: - BotValue += kJetpackCost; + BotValue += BALANCE_VAR(kJetpackCost); break; case PLAYERCLASS_ALIVE_LEVEL2: - BotValue += kGorgeCost; + BotValue += BALANCE_VAR(kGorgeCost); break; case PLAYERCLASS_ALIVE_LEVEL3: - BotValue += kLerkCost; + BotValue += BALANCE_VAR(kLerkCost); break; case PLAYERCLASS_ALIVE_LEVEL4: - BotValue += kFadeCost; + BotValue += BALANCE_VAR(kFadeCost); break; case PLAYERCLASS_ALIVE_LEVEL5: - BotValue += kOnosCost; + BotValue += BALANCE_VAR(kOnosCost); break; case PLAYERCLASS_ALIVE_GESTATING: BotValue += 10.0f;