Commit 1cf38944 authored by mercury233's avatar mercury233

update field

parent 20680fe3
...@@ -175,7 +175,7 @@ irr::video::ITexture* ImageManager::GetTexture(int code) { ...@@ -175,7 +175,7 @@ irr::video::ITexture* ImageManager::GetTexture(int code) {
return GetTextureThumb(code); return GetTextureThumb(code);
} else { } else {
tMap[code] = img; tMap[code] = img;
return img; return (img == NULL) ? tUnknown : img;
} }
} }
if(tit->second) if(tit->second)
...@@ -219,18 +219,18 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) { ...@@ -219,18 +219,18 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) {
if(tit == tFields.end()) { if(tit == tFields.end()) {
char file[256]; char file[256];
sprintf(file, "expansions/pics/field/%d.png", code); sprintf(file, "expansions/pics/field/%d.png", code);
irr::video::ITexture* img = driver->getTexture(file); irr::video::ITexture* img = GetTextureFromFile(file, 512, 512);
if(img == NULL) { if(img == NULL) {
sprintf(file, "expansions/pics/field/%d.jpg", code); sprintf(file, "expansions/pics/field/%d.jpg", code);
img = driver->getTexture(file); img = GetTextureFromFile(file, 512, 512);
} }
if(img == NULL) { if(img == NULL) {
sprintf(file, "pics/field/%d.png", code); sprintf(file, "pics/field/%d.png", code);
img = driver->getTexture(file); img = GetTextureFromFile(file, 512, 512);
} }
if(img == NULL) { if(img == NULL) {
sprintf(file, "pics/field/%d.jpg", code); sprintf(file, "pics/field/%d.jpg", code);
img = driver->getTexture(file); img = GetTextureFromFile(file, 512, 512);
if(img == NULL) { if(img == NULL) {
tFields[code] = NULL; tFields[code] = NULL;
return NULL; return NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment