X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=f2f5984f702ce2947bfa4c77bc4a4b1ff9086f8b;hp=f28df34f30713cc103e0ce83b88a854fb85fd243;hb=79425634db3735af2b7f6cfc1528c6cf7e99b559;hpb=2da0cf37374833d0f09e69da0c74135a5f2f0132 diff --git a/src/libgame/setup.c b/src/libgame/setup.c index f28df34f..f2f5984f 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -2820,22 +2820,13 @@ static TreeInfo *getArtworkInfoCacheEntry(LevelDirTree *level_node, int type) char *token = getCacheToken(token_prefix, artworkinfo_tokens[i].text); char *value = getHashEntry(artworkinfo_cache_old, token); - setSetupInfo(artworkinfo_tokens, i, value); - - /* check if cache entry for this item is invalid or incomplete */ - if (value == NULL) - { - Error(ERR_WARN, "cache entry '%s' invalid", token); - - cached = FALSE; - } + /* if defined, use value from cache, else keep default value */ + if (value != NULL) + setSetupInfo(artworkinfo_tokens, i, value); } *artwork_info = ldi; - } - if (cached) - { char *filename_levelinfo = getPath2(getLevelDirFromTreeInfo(level_node), LEVELINFO_FILENAME); char *filename_artworkinfo = getPath2(getSetupArtworkDir(artwork_info),