Merge pull request #1785 from Tianchenglipu/patch-1

load field from expansions/pics/field

Merge pull request #1785 from Tianchenglipu/patch-1
load field from expansions/pics/field
5c948144 · 独孤朲 · GitHub · 102d516a · 224bd0ef · 5c948144
Commit 5c948144 authored Jun 19, 2016 by 独孤朲 Committed by GitHub Jun 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

gframe/image_manager.cpp gframe/image_manager.cpp +9 -1

No files found.
--- a/gframe/image_manager.cpp
+++ b/gframe/image_manager.cpp
@@ -109,8 +109,16 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) {
 	auto tit = tFields.find(code);
 	if(tit == tFields.end()) {
 		char file[256];
-		sprintf(file, "pics/field/%d.png", code);
+		sprintf(file, "expansions/pics/field/%d.png", code);
 		irr::video::ITexture* img = driver->getTexture(file);
+		if(img == NULL) {
+			sprintf(file, "expansions/pics/field/%d.jpg", code);
+			img = driver->getTexture(file);
+		}
+		if(img == NULL) {
+			sprintf(file, "pics/field/%d.png", code);
+			img = driver->getTexture(file);
+		}
 		if(img == NULL) {
 			sprintf(file, "pics/field/%d.jpg", code);
 			img = driver->getTexture(file);