fix skymap autodownload error handling

- suppress error messages during map config execution, just like all
  missing media errors are suppressed during the first attempt

- don't queue manual attempts to load nonexisting skymaps for download
  (this is now consistent with other manual media use)
This commit is contained in:
ac-stef
2015-08-28 11:55:09 +02:00
parent 3456304702
commit 8f6b5d5802
+4 -1
View File
@@ -579,17 +579,20 @@ void loadskymap(bool reload)
}
flagmapconfigchange();
}
bool old_silent_texture_load = silent_texture_load;
if(autodownload && execcontext == IEXC_MAPCFG) silent_texture_load = true;
loopi(6)
{
defformatstring(name)("packages/%s%s_%s.jpg", legacyprefix, loadsky, side[i]);
sky[i] = textureload(name, 3);
if(sky[i] == notexture && !reload && autodownload)
if(sky[i] == notexture && !reload && autodownload && execcontext == IEXC_MAPCFG)
{
defformatstring(dl)("packages/%s%s", legacyprefix, loadsky);
requirepackage(PCK_SKYBOX, dl);
break;
}
}
silent_texture_load = old_silent_texture_load;
}
void loadnotexture(char *c)