X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=0a514169af088775ddd38262b3df6a25f10ac617;hb=c74a890afba46c41f6ba6ef691bc89da0dd0135c;hp=0088e431531eb5d04ae92f1dbb928c182a57fe64;hpb=d14ff3d04c44d90b4dc151fd7774946e20da0152;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 0088e431..0a514169 100644
--- a/src/files.c
+++ b/src/files.c
@@ -290,6 +290,10 @@ static struct
     EL_PLAYER_4,			CONF_VALUE_BOOLEAN_4,
     &li.use_explosion_element[3],	FALSE
   },
+  {
+    EL_PLAYER_1,			CONF_VALUE_BOOLEAN_5,
+    &li.continuous_snapping,		TRUE
+  },
   {
     EL_PLAYER_1,			CONF_VALUE_INTEGER_1,
     &li.initial_player_stepsize,	STEPSIZE_NORMAL
@@ -572,7 +576,9 @@ static void setLevelInfoToDefaults(struct LevelInfo *level)
   level->can_pass_to_walkable = FALSE;
   level->grow_into_diggable = TRUE;
 
+#if 0
   level->block_snap_field = TRUE;
+#endif
 
   level->block_last_field = FALSE;	/* EM does not block by default */
   level->sp_block_last_field = TRUE;	/* SP blocks the last field */
@@ -2974,8 +2980,12 @@ static void LoadLevelFromFileStream_SP(FILE *file, struct LevelInfo *level,
   level->time_wheel = 0;
   level->amoeba_content = EL_EMPTY;
 
+#if 1
+  /* original Supaplex does not use score values -- use default values */
+#else
   for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++)
     level->score[i] = 0;		/* !!! CORRECT THIS !!! */
+#endif
 
   /* there are no yamyams in supaplex levels */
   for (i = 0; i < level->num_yamyam_contents; i++)
@@ -3239,6 +3249,10 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename)
   }
 #endif
 
+#if 0
+  leveldir_current->latest_engine = TRUE;	/* !!! TEST ONLY !!! */
+#endif
+
   if (leveldir_current->latest_engine)
   {
     /* ---------- use latest game engine ----------------------------------- */
@@ -3307,6 +3321,12 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename)
 #endif
   }
 
+  if (level->game_version < VERSION_IDENT(3,2,0,7))
+  {
+    /* default behaviour for snapping was "not continuous" before 3.2.0-7 */
+    level->continuous_snapping = FALSE;
+  }
+
   /* only few elements were able to actively move into acid before 3.1.0 */
   /* trigger settings did not exist before 3.1.0; set to default "any" */
   if (level->game_version < VERSION_IDENT(3,1,0,0))
@@ -4769,6 +4789,7 @@ void SaveTape(int nr)
 
 void DumpTape(struct TapeInfo *tape)
 {
+  int tape_frame_counter;
   int i, j;
 
   if (tape->no_valid_file)
@@ -4786,12 +4807,14 @@ void DumpTape(struct TapeInfo *tape)
   printf("Level series identifier: '%s'\n", tape->level_identifier);
   printf_line("-", 79);
 
+  tape_frame_counter = 0;
+
   for (i = 0; i < tape->length; i++)
   {
     if (i >= MAX_TAPE_LEN)
       break;
 
-    printf("%03d: ", i);
+    printf("%04d: ", i);
 
     for (j = 0; j < MAX_PLAYERS; j++)
     {
@@ -4810,7 +4833,10 @@ void DumpTape(struct TapeInfo *tape)
       }
     }
 
-    printf("(%03d)\n", tape->pos[i].delay);
+    printf("(%03d) ", tape->pos[i].delay);
+    printf("[%05d]\n", tape_frame_counter);
+
+    tape_frame_counter += tape->pos[i].delay;
   }
 
   printf_line("-", 79);
@@ -4923,14 +4949,17 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_TIME_LIMIT			14
 #define SETUP_TOKEN_FULLSCREEN			15
 #define SETUP_TOKEN_ASK_ON_ESCAPE		16
-#define SETUP_TOKEN_GRAPHICS_SET		17
-#define SETUP_TOKEN_SOUNDS_SET			18
-#define SETUP_TOKEN_MUSIC_SET			19
-#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	20
-#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	21
-#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	22
-
-#define NUM_GLOBAL_SETUP_TOKENS			23
+#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR	17
+#define SETUP_TOKEN_QUICK_SWITCH		18
+#define SETUP_TOKEN_INPUT_ON_FOCUS		19
+#define SETUP_TOKEN_GRAPHICS_SET		20
+#define SETUP_TOKEN_SOUNDS_SET			21
+#define SETUP_TOKEN_MUSIC_SET			22
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	23
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	24
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	25
+
+#define NUM_GLOBAL_SETUP_TOKENS			26
 
 /* editor setup */
 #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH	0
@@ -4971,8 +5000,13 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_SHORTCUT_SAVE_GAME		0
 #define SETUP_TOKEN_SHORTCUT_LOAD_GAME		1
 #define SETUP_TOKEN_SHORTCUT_TOGGLE_PAUSE	2
+#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_1	3
+#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_2	4
+#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_3	5
+#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_4	6
+#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_ALL	7
 
-#define NUM_SHORTCUT_SETUP_TOKENS		3
+#define NUM_SHORTCUT_SETUP_TOKENS		8
 
 /* player setup */
 #define SETUP_TOKEN_PLAYER_USE_JOYSTICK		0
@@ -5033,6 +5067,9 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.time_limit,	"time_limit"			},
   { TYPE_SWITCH, &si.fullscreen,	"fullscreen"			},
   { TYPE_SWITCH, &si.ask_on_escape,	"ask_on_escape"			},
+  { TYPE_SWITCH, &si.ask_on_escape_editor, "ask_on_escape_editor"	},
+  { TYPE_SWITCH, &si.quick_switch,	"quick_player_switch"		},
+  { TYPE_SWITCH, &si.input_on_focus,	"input_on_focus"		},
   { TYPE_STRING, &si.graphics_set,	"graphics_set"			},
   { TYPE_STRING, &si.sounds_set,	"sounds_set"			},
   { TYPE_STRING, &si.music_set,		"music_set"			},
@@ -5072,7 +5109,6 @@ static struct TokenInfo editor_cascade_setup_tokens[] =
   { TYPE_SWITCH, &seci.el_ce,		"editor.cascade.el_ce"		},
   { TYPE_SWITCH, &seci.el_ge,		"editor.cascade.el_ge"		},
   { TYPE_SWITCH, &seci.el_user,		"editor.cascade.el_user"	},
-  { TYPE_SWITCH, &seci.el_generic,	"editor.cascade.el_generic"	},
   { TYPE_SWITCH, &seci.el_dynamic,	"editor.cascade.el_dynamic"	},
 };
 
@@ -5080,7 +5116,12 @@ static struct TokenInfo shortcut_setup_tokens[] =
 {
   { TYPE_KEY_X11, &ssi.save_game,	"shortcut.save_game"		},
   { TYPE_KEY_X11, &ssi.load_game,	"shortcut.load_game"		},
-  { TYPE_KEY_X11, &ssi.toggle_pause,	"shortcut.toggle_pause"		}
+  { TYPE_KEY_X11, &ssi.toggle_pause,	"shortcut.toggle_pause"		},
+  { TYPE_KEY_X11, &ssi.focus_player[0],	"shortcut.focus_player_1"	},
+  { TYPE_KEY_X11, &ssi.focus_player[1],	"shortcut.focus_player_2"	},
+  { TYPE_KEY_X11, &ssi.focus_player[2],	"shortcut.focus_player_3"	},
+  { TYPE_KEY_X11, &ssi.focus_player[3],	"shortcut.focus_player_4"	},
+  { TYPE_KEY_X11, &ssi.focus_player_all,"shortcut.focus_player_all"	},
 };
 
 static struct TokenInfo player_setup_tokens[] =
@@ -5100,18 +5141,18 @@ static struct TokenInfo player_setup_tokens[] =
   { TYPE_KEY_X11, &sii.key.up,		".key.move_up"			},
   { TYPE_KEY_X11, &sii.key.down,	".key.move_down"		},
   { TYPE_KEY_X11, &sii.key.snap,	".key.snap_field"		},
-  { TYPE_KEY_X11, &sii.key.drop,	".key.place_bomb"		}
+  { TYPE_KEY_X11, &sii.key.drop,	".key.place_bomb"		},
 };
 
 static struct TokenInfo system_setup_tokens[] =
 {
   { TYPE_STRING,  &syi.sdl_audiodriver,	"system.sdl_audiodriver"	},
-  { TYPE_INTEGER, &syi.audio_fragment_size,"system.audio_fragment_size"	}
+  { TYPE_INTEGER, &syi.audio_fragment_size,"system.audio_fragment_size"	},
 };
 
 static struct TokenInfo options_setup_tokens[] =
 {
-  { TYPE_BOOLEAN, &soi.verbose,		"options.verbose"		}
+  { TYPE_BOOLEAN, &soi.verbose,		"options.verbose"		},
 };
 
 static char *get_corrected_login_name(char *login_name)
@@ -5153,6 +5194,9 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->time_limit = TRUE;
   si->fullscreen = FALSE;
   si->ask_on_escape = TRUE;
+  si->ask_on_escape_editor = TRUE;
+  si->quick_switch = FALSE;
+  si->input_on_focus = FALSE;
 
   si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
   si->sounds_set = getStringCopy(SND_CLASSIC_SUBDIR);
@@ -5180,6 +5224,12 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
   si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE;
 
+  si->shortcut.focus_player[0] = DEFAULT_KEY_FOCUS_PLAYER_1;
+  si->shortcut.focus_player[1] = DEFAULT_KEY_FOCUS_PLAYER_2;
+  si->shortcut.focus_player[2] = DEFAULT_KEY_FOCUS_PLAYER_3;
+  si->shortcut.focus_player[3] = DEFAULT_KEY_FOCUS_PLAYER_4;
+  si->shortcut.focus_player_all = DEFAULT_KEY_FOCUS_PLAYER_ALL;
+
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     si->input[i].use_joystick = FALSE;
@@ -5221,7 +5271,6 @@ static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si)
   si->editor_cascade.el_ce	= FALSE;
   si->editor_cascade.el_ge	= FALSE;
   si->editor_cascade.el_user	= FALSE;
-  si->editor_cascade.el_generic	= FALSE;
   si->editor_cascade.el_dynamic	= FALSE;
 }
 
@@ -5317,7 +5366,7 @@ void LoadSetup()
   {
     char *player_name_new;
 
-    checkSetupFileHashIdentifier(setup_file_hash, getCookie("SETUP"));
+    checkSetupFileHashIdentifier(setup_file_hash, filename,getCookie("SETUP"));
     decodeSetupFileHash(setup_file_hash);
 
     setup.direct_draw = !setup.double_buffering;
@@ -5345,7 +5394,7 @@ void LoadSetup_EditorCascade()
 
   if (setup_file_hash)
   {
-    checkSetupFileHashIdentifier(setup_file_hash, getCookie("SETUP"));
+    checkSetupFileHashIdentifier(setup_file_hash, filename,getCookie("SETUP"));
     decodeSetupFileHash_EditorCascade(setup_file_hash);
 
     freeSetupFileHash(setup_file_hash);