Minor marine fixes

* Fixed crash when requesting HMG/GL when there was no advanced armoury present * Fixed marines trying to build structures which were not finished building, but are now recycling
RGreenlees · Sep 12, 2023 · b6b85c1 · b6b85c1
1 parent 602edad
commit b6b85c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/evobot/src/bot_commander.cpp b/evobot/src/bot_commander.cpp
@@ -450,7 +450,7 @@ void CommanderReceiveWeaponRequest(bot_t* pBot, edict_t* Requestor, NSStructureT
 			sprintf(buf, "Get near an armoury, %s", STRING(Requestor->v.netname));
 		}
 
-
+		return;
 	}
 
 	pBot->SupportAction.ActionType = ACTION_DEPLOY;

diff --git a/evobot/src/bot_tactical.cpp b/evobot/src/bot_tactical.cpp
@@ -3370,6 +3370,7 @@ edict_t* UTIL_FindClosestMarineStructureUnbuiltWithoutBuilders(bot_t* pBot, cons
 	{
 		if (!it.second.bOnNavmesh) { continue; }
 		if (it.second.bFullyConstructed) { continue; }
+		if (UTIL_StructureIsRecycling(it.second.edict)) { continue; }
 		bool bReachable = (IsPlayerOnMarineTeam(pBot->pEdict)) ? it.second.bIsReachableMarine : it.second.bIsReachableAlien;
 
 		if (!bReachable) { continue; }