X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=3ff575d19d7d2a10e9230384e386899e95bce5b7;hb=ab5c6efd336beb5933a525507a7f0744b196c3e3;hp=c96316f6e56fb4d9e117bb0a74a0a4f1b3980d73;hpb=fa628a204ea4662806244b0ed994a48b40ece2ca;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index c96316f6..3ff575d1 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -2113,7 +2113,8 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first, closedir(dir); - if (!valid_entry_found) + /* special case: top level directory may directly contain "levelinfo.conf" */ + if (node_parent == NULL && !valid_entry_found) { /* check if this directory directly contains a file "levelinfo.conf" */ valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent, @@ -2645,6 +2646,9 @@ char *getSetupValue(int type, void *value) break; } + if (type & TYPE_GHOSTED) + strcpy(value_string, "n/a"); + return value_string; }