X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=4fc58a407b3933a9d6cdd23f69ad54fdf7f06a09;hb=37a06df577bbfd00f4b361f92cacb0d97036ba93;hp=656bc519083cbd3458b55114328060b128917328;hpb=2432614fe471d61318ad634b1b8ce7f152fa43ea;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 656bc519..4fc58a40 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -1956,8 +1956,10 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, leveldir_new->fullpath = getPath2(node_parent->fullpath, directory_name); } +#if 0 if (leveldir_new->levels < 1) leveldir_new->levels = 1; +#endif leveldir_new->last_level = leveldir_new->first_level + leveldir_new->levels - 1; @@ -1987,6 +1989,19 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, (leveldir_new->user_defined || !leveldir_new->handicap ? leveldir_new->last_level : leveldir_new->first_level); +#if 1 + if (leveldir_new->levels < 1 && !leveldir_new->level_group) + { + /* skip level sets without levels (which are probably artwork base sets) */ + + freeSetupFileHash(setup_file_hash); + free(directory_path); + free(filename); + + return FALSE; + } +#endif + pushTreeInfo(node_first, leveldir_new); freeSetupFileHash(setup_file_hash);