X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=0a514169af088775ddd38262b3df6a25f10ac617;hb=c74a890afba46c41f6ba6ef691bc89da0dd0135c;hp=eccd265d3b20fcce99a6196c85e101c6a5846cc8;hpb=8384bb8b95c79c4c336d10de9a87a7287ecfd19c;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index eccd265d..0a514169 100644 --- a/src/files.c +++ b/src/files.c @@ -3249,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 ----------------------------------- */ @@ -4947,14 +4951,15 @@ void SaveScore(int nr) #define SETUP_TOKEN_ASK_ON_ESCAPE 16 #define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR 17 #define SETUP_TOKEN_QUICK_SWITCH 18 -#define SETUP_TOKEN_GRAPHICS_SET 19 -#define SETUP_TOKEN_SOUNDS_SET 20 -#define SETUP_TOKEN_MUSIC_SET 21 -#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 22 -#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 23 -#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 24 +#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 25 +#define NUM_GLOBAL_SETUP_TOKENS 26 /* editor setup */ #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 @@ -5064,6 +5069,7 @@ static struct TokenInfo global_setup_tokens[] = { 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" }, @@ -5190,6 +5196,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) 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);