Merge pull request OpenXcom#1015 from myk002/customarmorlogspam

Warboy1982 · Warboy1982 · commit db4841418450 · 2015-05-17T15:21:01.000+10:00
don't spam the logs when probing for armor sprites
diff --git a/src/Battlescape/InventoryState.cpp b/src/Battlescape/InventoryState.cpp
@@ -341,7 +341,10 @@ void InventoryState::init()
 		if (s->getLook() == LOOK_AFRICAN)
 			look += "3";
 		look += ".SPK";
-		if (!CrossPlatform::fileExists(FileMap::getFilePath("UFOGRAPH/" + look)) && !_game->getResourcePack()->getSurface(look))
+		const std::set<std::string> &ufographContents = FileMap::getVFolderContents("UFOGRAPH");
+		std::string lcaseLook = look;
+		std::transform(lcaseLook.begin(), lcaseLook.end(), lcaseLook.begin(), tolower);
+		if (ufographContents.find("lcaseLook") == ufographContents.end() && !_game->getResourcePack()->getSurface(look))
 		{
 			look = s->getArmor()->getSpriteInventory() + ".SPK";
 		}

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,10 @@ void InventoryState::init()`
`341`	`341`	`if (s->getLook() == LOOK_AFRICAN)`
`342`	`342`	`look += "3";`
`343`	`343`	`look += ".SPK";`
`344`		`- if (!CrossPlatform::fileExists(FileMap::getFilePath("UFOGRAPH/" + look)) && !_game->getResourcePack()->getSurface(look))`
	`344`	`+ const std::set<std::string> &ufographContents = FileMap::getVFolderContents("UFOGRAPH");`
	`345`	`+ std::string lcaseLook = look;`
	`346`	`+ std::transform(lcaseLook.begin(), lcaseLook.end(), lcaseLook.begin(), tolower);`
	`347`	`+ if (ufographContents.find("lcaseLook") == ufographContents.end() && !_game->getResourcePack()->getSurface(look))`
`345`	`348`	`{`
`346`	`349`	`look = s->getArmor()->getSpriteInventory() + ".SPK";`
`347`	`350`	`}`