Don't save "technical" items in the inv. templates

https://openxcom.org/forum/index.php/topic,11322.0.html
MeridianOXC · Jun 25, 2023 · fe8f927 · fe8f927
1 parent 26aaf9d
commit fe8f927
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/Battlescape/InventoryState.cpp b/src/Battlescape/InventoryState.cpp
@@ -716,6 +716,11 @@ void InventoryState::saveEquipmentLayout()
 				bool loaded = bi->needsAmmoForSlot(0) && bi->getAmmoForSlot(0);
 				if (!loaded) continue;
 			}
+			else if (!bi->getRules()->canBeEquippedToCraftInventory())
+			{
+				// skip other not-allowed items, which somehow made it here (e.g. were spawned instead of equipped)
+				continue;
+			}
 
 			layoutItems->push_back(new EquipmentLayoutItem(bi));
 		}
@@ -1229,6 +1234,11 @@ void InventoryState::_createInventoryTemplate(std::vector<EquipmentLayoutItem*>
 			bool loaded = bi->needsAmmoForSlot(0) && bi->getAmmoForSlot(0);
 			if (!loaded) continue;
 		}
+		else if (!bi->getRules()->canBeEquippedToCraftInventory())
+		{
+			// skip other not-allowed items, which somehow made it here (e.g. were spawned instead of equipped)
+			continue;
+		}
 
 		inventoryTemplate.push_back(new EquipmentLayoutItem(bi));
 	}