fix some bugs

Author: rafradek

src/mod/etc/extra_player_slots.cpp

@@ -64,15 +64,15 @@ namespace Mod::Etc::Extra_Player_Slots
     ConVar sig_etc_extra_player_slots_allow_bots("sig_etc_extra_player_slots_allow_bots", "0", FCVAR_NOTIFY | FCVAR_GAMEDLL,
 		"Allow bots to use extra player slots",
 		[](IConVar *pConVar, const char *pOldValue, float flOldValue){
-			if (sig_etc_extra_player_slots_allow_bots.GetBool() && flOldValue == 0.0f && ExtraSlotsEnabled() && gpGlobals->maxClients < sig_etc_extra_player_slots_count.GetInt()) {
+			if (sig_etc_extra_player_slots_allow_bots.GetBool() && cvar_enable.GetBool() && flOldValue == 0.0f && ExtraSlotsEnabled() && gpGlobals->maxClients < sig_etc_extra_player_slots_count.GetInt()) {
                 engine->ChangeLevel(STRING(gpGlobals->mapname), nullptr);
             }
 		});
 
     ConVar sig_etc_extra_player_slots_allow_players("sig_etc_extra_player_slots_allow_players", "0", FCVAR_NOTIFY,
 		"Allow players to use extra player slots",
 		[](IConVar *pConVar, const char *pOldValue, float flOldValue){
-			if (sig_etc_extra_player_slots_allow_players.GetBool() && flOldValue == 0.0f && ExtraSlotsEnabled() && gpGlobals->maxClients < sig_etc_extra_player_slots_count.GetInt()) {
+			if (sig_etc_extra_player_slots_allow_players.GetBool() && cvar_enable.GetBool() && flOldValue == 0.0f && ExtraSlotsEnabled() && gpGlobals->maxClients < sig_etc_extra_player_slots_count.GetInt()) {
                 engine->ChangeLevel(STRING(gpGlobals->mapname), nullptr);
             }
 		});

src/mod/mvm/gamemode_converter.cpp

@@ -114,7 +114,7 @@ namespace Mod::MvM::Gamemode_Converter
         bool shouldPlaceHatch = false;
         Vector hatchPropOrigin = vec3_origin;
 
-        std::list<ParsedEntity>::iterator captureZone;
+        std::list<ParsedEntity>::iterator captureZone = parsedEntities.end();
 
         for (auto it = parsedEntities.begin(); it != parsedEntities.end();) {
             auto &parsedEntity = *it;
@@ -591,10 +591,12 @@ namespace Mod::MvM::Gamemode_Converter
             hatchDestroyRelay.emplace("OnTrigger", "hatch_kill,Disable,,0.5,-1");
         }
 
-        captureZone->erase("teamnum");
-        captureZone->emplace("teamnum", "3");
-        captureZone->emplace("OnCapture", "bots_win,RoundWin,,0,-1");
-        captureZone->emplace("OnCapture", "hatch_bust_relay,trigger,,1,-1");
+        if (captureZone != parsedEntities.end()) {
+            captureZone->erase("teamnum");
+            captureZone->emplace("teamnum", "3");
+            captureZone->emplace("OnCapture", "bots_win,RoundWin,,0,-1");
+            captureZone->emplace("OnCapture", "hatch_bust_relay,trigger,,1,-1");
+        }
 
         WriteEntityString(entitiesStr, parsedEntities);
 

src/mod/pop/wavespawn_extensions.cpp

@@ -839,6 +839,10 @@ namespace Mod::Pop::WaveSpawn_Extensions
 		// delete the temporary copy of the KV subtree
 		kv->deleteThis();
 
+		if (result && wavespawn->m_totalCount > 100000 && rtti_cast<CRandomChoiceSpawner *>(wavespawn->m_Spawner)) {
+			wavespawn->m_totalCount = 100000;
+			Warning("Total count of wavespawn %s reduced to 100000 to reduce RandomChoice related memory leaks\n", wavespawn->m_name.Get());
+		}
 		if (result && hidden) {
 			last_wavespawn_hidden = true;
 		}
@@ -1363,6 +1367,37 @@ namespace Mod::Pop::WaveSpawn_Extensions
 		return DETOUR_MEMBER_CALL(NextBotManager_ShouldUpdate)(bot);
 	}*/
 
+	DETOUR_DECL_MEMBER(string_t, CRandomChoiceSpawner_GetClassIcon, int index)
+	{
+		auto spawner = reinterpret_cast<CRandomChoiceSpawner *>(this);
+		if (spawner->m_SubSpawners.IsEmpty()) return NULL_STRING;
+		return DETOUR_MEMBER_CALL(CRandomChoiceSpawner_GetClassIcon)(index);
+	}
+	DETOUR_DECL_MEMBER(bool, CRandomChoiceSpawner_IsMiniBoss, int index)
+	{
+		auto spawner = reinterpret_cast<CRandomChoiceSpawner *>(this);
+		if (spawner->m_SubSpawners.IsEmpty()) return false;
+		return DETOUR_MEMBER_CALL(CRandomChoiceSpawner_IsMiniBoss)(index);
+	}
+	DETOUR_DECL_MEMBER(bool, CRandomChoiceSpawner_HasAttribute, CTFBot::AttributeType attr, int index)
+	{
+		auto spawner = reinterpret_cast<CRandomChoiceSpawner *>(this);
+		if (spawner->m_SubSpawners.IsEmpty()) return false;
+		return DETOUR_MEMBER_CALL(CRandomChoiceSpawner_HasAttribute)(attr, index);
+	}
+	DETOUR_DECL_MEMBER(int, CRandomChoiceSpawner_GetClass, int index)
+	{
+		auto spawner = reinterpret_cast<CRandomChoiceSpawner *>(this);
+		if (spawner->m_SubSpawners.IsEmpty()) return false;
+		return DETOUR_MEMBER_CALL(CRandomChoiceSpawner_GetClass)(index);
+	}
+	DETOUR_DECL_MEMBER(int, CRandomChoiceSpawner_GetHealth, int index)
+	{
+		auto spawner = reinterpret_cast<CRandomChoiceSpawner *>(this);
+		if (spawner->m_SubSpawners.IsEmpty()) return false;
+		return DETOUR_MEMBER_CALL(CRandomChoiceSpawner_GetHealth)(index);
+	}
+	
 	class CMod : public IMod, public IModCallbackListener, IFrameUpdatePostEntityThinkListener
 	{
 	public:
@@ -1399,6 +1434,13 @@ namespace Mod::Pop::WaveSpawn_Extensions
 			MOD_ADD_DETOUR_MEMBER(CWave_AddClassType, "CWave::AddClassType");
 
 			MOD_ADD_DETOUR_MEMBER(CRandomChoiceSpawner_Parse, "CRandomChoiceSpawner::Parse");
+
+			// Fix CRandomChoiceSpawner crashes when the block is empty
+			MOD_ADD_DETOUR_MEMBER(CRandomChoiceSpawner_GetClassIcon, "CRandomChoiceSpawner::GetClassIcon");
+			MOD_ADD_DETOUR_MEMBER(CRandomChoiceSpawner_IsMiniBoss,   "CRandomChoiceSpawner::IsMiniBoss");
+			MOD_ADD_DETOUR_MEMBER(CRandomChoiceSpawner_HasAttribute, "CRandomChoiceSpawner::HasAttribute");
+			MOD_ADD_DETOUR_MEMBER(CRandomChoiceSpawner_GetClass, "CRandomChoiceSpawner::GetClass");
+			MOD_ADD_DETOUR_MEMBER(CRandomChoiceSpawner_GetHealth, "CRandomChoiceSpawner::GetHealth");
 
 		}