X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=3557e949273a30f1c3ffc5f3ddd7b456af62ac2b;hb=7991a249fc798c3b7330def99bf61a33717a4ea1;hp=60bb56853b59b6016a0454730a43111b71316fca;hpb=0d2fcc38f14413196242563d64a2d2b52cf28d68;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 60bb5685..3557e949 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -2636,11 +2636,13 @@ SetupFileHash *loadSetupFileHash(char *filename)
 #define LEVELINFO_TOKEN_FILENAME		24
 #define LEVELINFO_TOKEN_FILETYPE		25
 #define LEVELINFO_TOKEN_SPECIAL_FLAGS		26
-#define LEVELINFO_TOKEN_HANDICAP		27
-#define LEVELINFO_TOKEN_SKIP_LEVELS		28
-#define LEVELINFO_TOKEN_USE_EMC_TILES		29
+#define LEVELINFO_TOKEN_EMPTY_LEVEL_NAME	27
+#define LEVELINFO_TOKEN_FORCE_LEVEL_NAME	28
+#define LEVELINFO_TOKEN_HANDICAP		29
+#define LEVELINFO_TOKEN_SKIP_LEVELS		30
+#define LEVELINFO_TOKEN_USE_EMC_TILES		31
 
-#define NUM_LEVELINFO_TOKENS			30
+#define NUM_LEVELINFO_TOKENS			32
 
 static LevelDirTree ldi;
 
@@ -2674,6 +2676,8 @@ static struct TokenInfo levelinfo_tokens[] =
   { TYPE_STRING,	&ldi.level_filename,	"filename"		},
   { TYPE_STRING,	&ldi.level_filetype,	"filetype"		},
   { TYPE_STRING,	&ldi.special_flags,	"special_flags"		},
+  { TYPE_STRING,	&ldi.empty_level_name,	"empty_level_name"	},
+  { TYPE_BOOLEAN,	&ldi.force_level_name,	"force_level_name"	},
   { TYPE_BOOLEAN,	&ldi.handicap,		"handicap"		},
   { TYPE_BOOLEAN,	&ldi.skip_levels,	"skip_levels"		},
   { TYPE_BOOLEAN,	&ldi.use_emc_tiles,	"use_emc_tiles"		}
@@ -2771,6 +2775,9 @@ static void setTreeInfoToDefaults(TreeInfo *ti, int type)
 
     ti->special_flags = NULL;
 
+    ti->empty_level_name = NULL;
+    ti->force_level_name = FALSE;
+
     ti->levels = 0;
     ti->first_level = 0;
     ti->last_level = 0;
@@ -2853,6 +2860,9 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ti, TreeInfo *parent)
 
     ti->special_flags = getStringCopy(parent->special_flags);
 
+    ti->empty_level_name = getStringCopy(parent->empty_level_name);
+    ti->force_level_name = parent->force_level_name;
+
     ti->levels = parent->levels;
     ti->first_level = parent->first_level;
     ti->last_level = parent->last_level;
@@ -2915,6 +2925,9 @@ static TreeInfo *getTreeInfoCopy(TreeInfo *ti)
 
   ti_copy->special_flags	= getStringCopy(ti->special_flags);
 
+  ti_copy->empty_level_name	= getStringCopy(ti->empty_level_name);
+  ti_copy->force_level_name	= ti->force_level_name;
+
   ti_copy->levels		= ti->levels;
   ti_copy->first_level		= ti->first_level;
   ti_copy->last_level		= ti->last_level;