Unified usage of Armor.spriteInv across all UIs

https://openxcom.org/forum/index.php/topic,2027.msg149369.html#msg149369
MeridianOXC · Apr 16, 2023 · 88d7da2 · 88d7da2
1 parent 82b7b11
commit 88d7da2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Battlescape/InventoryState.cpp b/src/Battlescape/InventoryState.cpp
@@ -340,11 +340,23 @@ void InventoryState::init()
 		{
 			look = s->getArmor()->getSpriteInventory() + ".SPK";
 		}
+		if (!_game->getMod()->getSurface(look, false))
+		{
+			look = s->getArmor()->getSpriteInventory();
+		}
 		_game->getMod()->getSurface(look)->blit(_soldier);
 	}
 	else
 	{
 		Surface *armorSurface = _game->getMod()->getSurface(unit->getArmor()->getSpriteInventory(), false);
+		if (!armorSurface)
+		{
+			armorSurface = _game->getMod()->getSurface(unit->getArmor()->getSpriteInventory() + ".SPK", false);
+		}
+		if (!armorSurface)
+		{
+			armorSurface = _game->getMod()->getSurface(unit->getArmor()->getSpriteInventory() + "M0.SPK", false);
+		}
 		if (armorSurface)
 		{
 			armorSurface->blit(_soldier);

diff --git a/src/Ufopaedia/ArticleStateArmor.cpp b/src/Ufopaedia/ArticleStateArmor.cpp
@@ -70,6 +70,10 @@ namespace OpenXcom
 		{
 			look = armor->getSpriteInventory() + ".SPK";
 		}
+		if (!_game->getMod()->getSurface(look, false))
+		{
+			look = armor->getSpriteInventory();
+		}
 		_game->getMod()->getSurface(look)->blit(_image);