X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=9e35b4dbe240b10e2ab93b8aaf7fc5b6c88429de;hb=3d7779514ea1fa0a79312ec8e98f08e5b1096fcb;hp=65e504e5665476814a33cf3969c2c37bde2c6d60;hpb=93926b59ca45db5bb31f63e08d7ee729745e0306;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 65e504e5..9e35b4db 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -2375,10 +2375,11 @@ void checkSetupFileHashIdentifier(SetupFileHash *setup_file_hash,
 #define LEVELINFO_TOKEN_MUSIC_SET		18
 #define LEVELINFO_TOKEN_FILENAME		19
 #define LEVELINFO_TOKEN_FILETYPE		20
-#define LEVELINFO_TOKEN_HANDICAP		21
-#define LEVELINFO_TOKEN_SKIP_LEVELS		22
+#define LEVELINFO_TOKEN_SPECIAL_FLAGS		21
+#define LEVELINFO_TOKEN_HANDICAP		22
+#define LEVELINFO_TOKEN_SKIP_LEVELS		23
 
-#define NUM_LEVELINFO_TOKENS			23
+#define NUM_LEVELINFO_TOKENS			24
 
 static LevelDirTree ldi;
 
@@ -2406,6 +2407,7 @@ static struct TokenInfo levelinfo_tokens[] =
   { TYPE_STRING,	&ldi.music_set,		"music_set"		},
   { TYPE_STRING,	&ldi.level_filename,	"filename"		},
   { TYPE_STRING,	&ldi.level_filetype,	"filetype"		},
+  { TYPE_STRING,	&ldi.special_flags,	"special_flags"		},
   { TYPE_BOOLEAN,	&ldi.handicap,		"handicap"		},
   { TYPE_BOOLEAN,	&ldi.skip_levels,	"skip_levels"		}
 };
@@ -2482,6 +2484,8 @@ static void setTreeInfoToDefaults(TreeInfo *ti, int type)
     ti->level_filename = NULL;
     ti->level_filetype = NULL;
 
+    ti->special_flags = NULL;
+
     ti->levels = 0;
     ti->first_level = 0;
     ti->last_level = 0;
@@ -2553,6 +2557,8 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ti, TreeInfo *parent)
     ti->level_filename = NULL;
     ti->level_filetype = NULL;
 
+    ti->special_flags = getStringCopy(parent->special_flags);
+
     ti->levels = 0;
     ti->first_level = 0;
     ti->last_level = 0;
@@ -2604,6 +2610,8 @@ static TreeInfo *getTreeInfoCopy(TreeInfo *ti)
   ti_copy->level_filename	= getStringCopy(ti->level_filename);
   ti_copy->level_filetype	= getStringCopy(ti->level_filetype);
 
+  ti_copy->special_flags	= getStringCopy(ti->special_flags);
+
   ti_copy->levels		= ti->levels;
   ti_copy->first_level		= ti->first_level;
   ti_copy->last_level		= ti->last_level;
@@ -2665,6 +2673,8 @@ static void freeTreeInfo(TreeInfo *ti)
 
     checked_free(ti->level_filename);
     checked_free(ti->level_filetype);
+
+    checked_free(ti->special_flags);
   }
 
   checked_free(ti);
@@ -2687,6 +2697,10 @@ void setSetupInfo(struct TokenInfo *token_info,
       *(boolean *)setup_value = get_boolean_from_string(token_value);
       break;
 
+    case TYPE_SWITCH3:
+      *(int *)setup_value = get_switch3_from_string(token_value);
+      break;
+
     case TYPE_KEY:
       *(Key *)setup_value = getKeyFromKeyName(token_value);
       break;
@@ -3749,10 +3763,20 @@ char *getSetupValue(int type, void *value)
       strcpy(value_string, (*(boolean *)value ? "on" : "off"));
       break;
 
+    case TYPE_SWITCH3:
+      strcpy(value_string, (*(int *)value == AUTO  ? "auto" :
+			    *(int *)value == FALSE ? "off" : "on"));
+      break;
+
     case TYPE_YES_NO:
       strcpy(value_string, (*(boolean *)value ? "yes" : "no"));
       break;
 
+    case TYPE_YES_NO_AUTO:
+      strcpy(value_string, (*(int *)value == AUTO  ? "auto" :
+			    *(int *)value == FALSE ? "no" : "yes"));
+      break;
+
     case TYPE_ECS_AGA:
       strcpy(value_string, (*(boolean *)value ? "AGA" : "ECS"));
       break;