X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=d5ad588bc7c111607d88aafaf6182284efa16caf;hb=8c6f354ceb0f49857489ef2df0303e155e7f6846;hp=1bcbec75a4341748095f29dd9cba338414c88868;hpb=e0e2697df0d0da483a91b1248c120aef6b3caf9b;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 1bcbec75..d5ad588b 100644
--- a/src/files.c
+++ b/src/files.c
@@ -798,6 +798,8 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
     }
     else if (tape->file_version < FILE_VERSION_2_0)
     {
+      /* convert pre-2.0 tapes to new tape format */
+
       if (tape->pos[i].delay > 1)
       {
 	/* action part */
@@ -1168,17 +1170,18 @@ void SaveScore(int level_nr)
 #define SETUP_TOKEN_SOUND_LOOPS		2
 #define SETUP_TOKEN_SOUND_MUSIC		3
 #define SETUP_TOKEN_SOUND_SIMPLE	4
-#define SETUP_TOKEN_SCROLL_DELAY	5
-#define SETUP_TOKEN_SOFT_SCROLLING	6
-#define SETUP_TOKEN_FADING		7
-#define SETUP_TOKEN_AUTORECORD		8
-#define SETUP_TOKEN_QUICK_DOORS		9
-#define SETUP_TOKEN_TEAM_MODE		10
-#define SETUP_TOKEN_HANDICAP		11
-#define SETUP_TOKEN_TIME_LIMIT		12
-#define SETUP_TOKEN_FULLSCREEN		13
-
-#define NUM_GLOBAL_SETUP_TOKENS		14
+#define SETUP_TOKEN_TOONS		5
+#define SETUP_TOKEN_SCROLL_DELAY	6
+#define SETUP_TOKEN_SOFT_SCROLLING	7
+#define SETUP_TOKEN_FADING		8
+#define SETUP_TOKEN_AUTORECORD		9
+#define SETUP_TOKEN_QUICK_DOORS		10
+#define SETUP_TOKEN_TEAM_MODE		11
+#define SETUP_TOKEN_HANDICAP		12
+#define SETUP_TOKEN_TIME_LIMIT		13
+#define SETUP_TOKEN_FULLSCREEN		14
+
+#define NUM_GLOBAL_SETUP_TOKENS		15
 
 /* player setup */
 #define SETUP_TOKEN_USE_JOYSTICK	0
@@ -1211,6 +1214,7 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH,  &si.sound_loops,	"repeating_sound_loops"		},
   { TYPE_SWITCH,  &si.sound_music,	"background_music"		},
   { TYPE_SWITCH,  &si.sound_simple,	"simple_sound_effects"		},
+  { TYPE_SWITCH,  &si.toons,		"toons"				},
   { TYPE_SWITCH,  &si.scroll_delay,	"scroll_delay"			},
   { TYPE_SWITCH,  &si.soft_scrolling,	"soft_scrolling"		},
   { TYPE_SWITCH,  &si.fading,		"screen_fading"			},