TYPE_BOOLEAN, CONF_VALUE_8_BIT(12),
&li.shifted_relocation, FALSE
},
+ {
+ EL_PLAYER_1, -1,
+ TYPE_BOOLEAN, CONF_VALUE_8_BIT(15),
+ &li.lazy_relocation, FALSE
+ },
/* (these values are different for each player) */
{
int envelope_nr = element - EL_ENVELOPE_1;
int real_chunk_size = 2;
+ xx_envelope = level->envelope[envelope_nr]; /* copy into temporary buffer */
+
while (!checkEndOfFile(file))
{
real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_NOTE,
break;
}
- level->envelope[envelope_nr] = xx_envelope;
+ level->envelope[envelope_nr] = xx_envelope; /* copy from temporary buffer */
return real_chunk_size;
}
{ TYPE_STRING, &sxi.fallback_sounds_file, "fallback_sounds_file" },
{ TYPE_STRING, &sxi.fallback_music_file, "fallback_music_file" },
{ TYPE_STRING, &sxi.default_level_series, "default_level_series" },
- { TYPE_STRING, &sxi.choose_from_top_leveldir, "choose_from_top_leveldir" },
+ { TYPE_BOOLEAN,&sxi.choose_from_top_leveldir, "choose_from_top_leveldir" },
};
static struct TokenInfo options_setup_tokens[] =
/* (eg, init "viewport.door_1.MAIN.xyz" from "viewport.door_1.xyz") */
for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
{
+ viewport.window[i] = viewport.window[GFX_SPECIAL_ARG_DEFAULT];
viewport.playfield[i] = viewport.playfield[GFX_SPECIAL_ARG_DEFAULT];
- viewport.door_1[i] = viewport.door_1[GFX_SPECIAL_ARG_DEFAULT];
+ viewport.door_1[i] = viewport.door_1[GFX_SPECIAL_ARG_DEFAULT];
+
if (i != GFX_SPECIAL_ARG_EDITOR) /* editor value already initialized */
viewport.door_2[i] = viewport.door_2[GFX_SPECIAL_ARG_DEFAULT];
}
static void InitMenuDesignSettings_SpecialPostProcessing()
{
+ static struct
+ {
+ struct XY *dst, *src;
+ }
+ game_buttons_xy[] =
+ {
+ { &game.button.save, &game.button.stop },
+ { &game.button.pause2, &game.button.pause },
+ { &game.button.load, &game.button.play },
+ { &game.button.undo, &game.button.stop },
+ { &game.button.redo, &game.button.play },
+
+ { NULL, NULL }
+ };
+ int i;
+
/* special case: initialize later added SETUP list size from LEVELS value */
if (menu.list_size[GAME_MODE_SETUP] == -1)
menu.list_size[GAME_MODE_SETUP] = menu.list_size[GAME_MODE_LEVELS];
+
+ /* set default position for snapshot buttons to stop/pause/play buttons */
+ for (i = 0; game_buttons_xy[i].dst != NULL; i++)
+ {
+ if ((*game_buttons_xy[i].dst).x == -1 &&
+ (*game_buttons_xy[i].dst).y == -1)
+ {
+ (*game_buttons_xy[i].dst).x = (*game_buttons_xy[i].src).x;
+ (*game_buttons_xy[i].dst).y = (*game_buttons_xy[i].src).y;
+ }
+ }
}
static void LoadMenuDesignSettingsFromFilename(char *filename)
/* (eg, init "viewport.door_1.MAIN.xyz" from "viewport.door_1.xyz") */
for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
{
+ char *token_w1 = "viewport.window.width";
+ char *token_w2 = "viewport.window.height";
char *token_01 = "viewport.playfield.x";
char *token_02 = "viewport.playfield.y";
char *token_03 = "viewport.playfield.width";
char *token_13 = "viewport.door_2.width";
char *token_14 = "viewport.door_2.height";
char *token_15 = "viewport.door_2.border_size";
+ char *value_w1 = getHashEntry(setup_file_hash, token_w1);
+ char *value_w2 = getHashEntry(setup_file_hash, token_w2);
char *value_01 = getHashEntry(setup_file_hash, token_01);
char *value_02 = getHashEntry(setup_file_hash, token_02);
char *value_03 = getHashEntry(setup_file_hash, token_03);
char *value_14 = getHashEntry(setup_file_hash, token_14);
char *value_15 = getHashEntry(setup_file_hash, token_15);
+ if (value_w1 != NULL)
+ viewport.window[i].width = get_token_parameter_value(token_w1, value_w1);
+ if (value_w2 != NULL)
+ viewport.window[i].height = get_token_parameter_value(token_w2, value_w2);
if (value_01 != NULL)
viewport.playfield[i].x = get_token_parameter_value(token_01, value_01);
if (value_02 != NULL)