projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed function
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 38f142585ac07cf49157ae22cd4050149e1e5796..60d21c324ce36f4989b7258075512486c10acfc9 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-2334,6
+2334,11
@@
void setElementChangeInfoToDefaults(struct ElementChangeInfo *change)
static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
{
static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
{
+ boolean add_border = FALSE;
+ int x1 = 0;
+ int y1 = 0;
+ int x2 = STD_LEV_FIELDX - 1;
+ int y2 = STD_LEV_FIELDY - 1;
int i, x, y;
li = *level; // copy level data into temporary buffer
int i, x, y;
li = *level; // copy level data into temporary buffer
@@
-2372,15
+2377,35
@@
static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
// set default game engine type
level->game_engine_type = setup.default_game_engine_type;
// set default game engine type
level->game_engine_type = setup.default_game_engine_type;
+ // some game engines should have a default playfield with border elements
+ if (level->game_engine_type == GAME_ENGINE_TYPE_BD ||
+ level->game_engine_type == GAME_ENGINE_TYPE_EM ||
+ level->game_engine_type == GAME_ENGINE_TYPE_SP)
+ {
+ add_border = TRUE;
+ x1++;
+ y1++;
+ x2--;
+ y2--;
+ }
+
// set level playfield to playable default level with player and exit
for (x = 0; x < MAX_LEV_FIELDX; x++)
// set level playfield to playable default level with player and exit
for (x = 0; x < MAX_LEV_FIELDX; x++)
+ {
for (y = 0; y < MAX_LEV_FIELDY; y++)
for (y = 0; y < MAX_LEV_FIELDY; y++)
- level->field[x][y] = EL_SAND;
+ {
+ if (add_border && (x == 0 || x == STD_LEV_FIELDX - 1 ||
+ y == 0 || y == STD_LEV_FIELDY - 1))
+ level->field[x][y] = getEngineElement(EL_STEELWALL);
+ else
+ level->field[x][y] = getEngineElement(EL_SAND);
+ }
+ }
- level->field[
0][0] = EL_PLAYER_1
;
- level->field[
STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED
;
+ level->field[
x1][y1] = getEngineElement(EL_PLAYER_1)
;
+ level->field[
x2][y2] = getEngineElement(EL_EXIT_CLOSED)
;
- BorderElement =
EL_STEELWALL
;
+ BorderElement =
getEngineElement(EL_STEELWALL)
;
// detect custom elements when loading them
level->file_has_custom_elements = FALSE;
// detect custom elements when loading them
level->file_has_custom_elements = FALSE;
@@
-10642,6
+10667,10
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_SWITCH,
&setup.skip_levels, "skip_levels"
},
TYPE_SWITCH,
&setup.skip_levels, "skip_levels"
},
+ {
+ TYPE_SWITCH_3_STATES,
+ &setup.allow_skipping_levels, "allow_skipping_levels"
+ },
{
TYPE_SWITCH,
&setup.increment_levels, "increment_levels"
{
TYPE_SWITCH,
&setup.increment_levels, "increment_levels"
@@
-10747,9
+10776,25
@@
static struct TokenInfo global_setup_tokens[] =
&setup.bd_scroll_delay, "bd_scroll_delay"
},
{
&setup.bd_scroll_delay, "bd_scroll_delay"
},
{
- TYPE_SWITCH3,
+ TYPE_SWITCH,
+ &setup.bd_show_invisible_outbox, "bd_show_invisible_outbox"
+ },
+ {
+ TYPE_SWITCH_3_STATES,
&setup.bd_smooth_movements, "bd_smooth_movements"
},
&setup.bd_smooth_movements, "bd_smooth_movements"
},
+ {
+ TYPE_SWITCH_3_STATES,
+ &setup.bd_pushing_graphics, "bd_pushing_graphics"
+ },
+ {
+ TYPE_SWITCH_3_STATES,
+ &setup.bd_up_down_graphics, "bd_up_down_graphics"
+ },
+ {
+ TYPE_SWITCH_3_STATES,
+ &setup.bd_skip_falling_sounds, "bd_skip_falling_sounds"
+ },
{
TYPE_INTEGER,
&setup.bd_palette_c64, "bd_palette_c64"
{
TYPE_INTEGER,
&setup.bd_palette_c64, "bd_palette_c64"
@@
-10766,6
+10811,10
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_INTEGER,
&setup.bd_default_color_type, "bd_default_color_type"
},
TYPE_INTEGER,
&setup.bd_default_color_type, "bd_default_color_type"
},
+ {
+ TYPE_SWITCH,
+ &setup.bd_random_colors, "bd_random_colors"
+ },
{
TYPE_SWITCH,
&setup.sp_show_border_elements, "sp_show_border_elements"
{
TYPE_SWITCH,
&setup.sp_show_border_elements, "sp_show_border_elements"
@@
-10799,15
+10848,15
@@
static struct TokenInfo global_setup_tokens[] =
&setup.music_set, "music_set"
},
{
&setup.music_set, "music_set"
},
{
- TYPE_SWITCH
3
,
+ TYPE_SWITCH
_3_STATES
,
&setup.override_level_graphics, "override_level_graphics"
},
{
&setup.override_level_graphics, "override_level_graphics"
},
{
- TYPE_SWITCH
3
,
+ TYPE_SWITCH
_3_STATES
,
&setup.override_level_sounds, "override_level_sounds"
},
{
&setup.override_level_sounds, "override_level_sounds"
},
{
- TYPE_SWITCH
3
,
+ TYPE_SWITCH
_3_STATES
,
&setup.override_level_music, "override_level_music"
},
{
&setup.override_level_music, "override_level_music"
},
{
@@
-10822,6
+10871,10
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_INTEGER,
&setup.volume_music, "volume_music"
},
TYPE_INTEGER,
&setup.volume_music, "volume_music"
},
+ {
+ TYPE_SWITCH,
+ &setup.audio_sample_rate_44100, "audio_sample_rate_44100"
+ },
{
TYPE_SWITCH,
&setup.network_mode, "network_mode"
{
TYPE_SWITCH,
&setup.network_mode, "network_mode"
@@
-11142,6
+11195,14
@@
static struct TokenInfo shortcut_setup_tokens[] =
TYPE_KEY_X11,
&setup.shortcut.snap_down, "shortcut.snap_down"
},
TYPE_KEY_X11,
&setup.shortcut.snap_down, "shortcut.snap_down"
},
+ {
+ TYPE_KEY_X11,
+ &setup.shortcut.speed_fast, "shortcut.speed_fast"
+ },
+ {
+ TYPE_KEY_X11,
+ &setup.shortcut.speed_slow, "shortcut.speed_slow"
+ },
};
static struct SetupInputInfo setup_input;
};
static struct SetupInputInfo setup_input;
@@
-11383,6
+11444,10
@@
static struct TokenInfo internal_setup_tokens[] =
TYPE_BOOLEAN,
&setup.internal.menu_shortcuts_snap, "menu_shortcuts_snap"
},
TYPE_BOOLEAN,
&setup.internal.menu_shortcuts_snap, "menu_shortcuts_snap"
},
+ {
+ TYPE_BOOLEAN,
+ &setup.internal.menu_shortcuts_speed, "menu_shortcuts_speed"
+ },
{
TYPE_BOOLEAN,
&setup.internal.info_title, "info_title"
{
TYPE_BOOLEAN,
&setup.internal.info_title, "info_title"
@@
-11511,7
+11576,7
@@
static struct TokenInfo debug_setup_tokens[] =
&setup.debug.show_frames_per_second, "debug.show_frames_per_second"
},
{
&setup.debug.show_frames_per_second, "debug.show_frames_per_second"
},
{
- TYPE_SWITCH
3
,
+ TYPE_SWITCH
_3_STATES
,
&setup.debug.xsn_mode, "debug.xsn_mode"
},
{
&setup.debug.xsn_mode, "debug.xsn_mode"
},
{
@@
-11564,6
+11629,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->team_mode = FALSE;
si->handicap = TRUE;
si->skip_levels = TRUE;
si->team_mode = FALSE;
si->handicap = TRUE;
si->skip_levels = TRUE;
+ si->allow_skipping_levels = STATE_ASK;
si->increment_levels = TRUE;
si->auto_play_next_level = TRUE;
si->count_score_after_game = TRUE;
si->increment_levels = TRUE;
si->auto_play_next_level = TRUE;
si->count_score_after_game = TRUE;
@@
-11590,11
+11656,16
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->bd_skip_uncovering = FALSE;
si->bd_skip_hatching = FALSE;
si->bd_scroll_delay = TRUE;
si->bd_skip_uncovering = FALSE;
si->bd_skip_hatching = FALSE;
si->bd_scroll_delay = TRUE;
- si->bd_smooth_movements = AUTO;
+ si->bd_show_invisible_outbox = FALSE;
+ si->bd_smooth_movements = STATE_AUTO;
+ si->bd_pushing_graphics = STATE_TRUE;
+ si->bd_up_down_graphics = STATE_TRUE;
+ si->bd_skip_falling_sounds = STATE_AUTO;
si->bd_palette_c64 = GD_DEFAULT_PALETTE_C64;
si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
si->bd_default_color_type = GD_DEFAULT_COLOR_TYPE;
si->bd_palette_c64 = GD_DEFAULT_PALETTE_C64;
si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
si->bd_default_color_type = GD_DEFAULT_COLOR_TYPE;
+ si->bd_random_colors = FALSE;
si->sp_show_border_elements = FALSE;
si->small_game_graphics = FALSE;
si->show_load_save_buttons = FALSE;
si->sp_show_border_elements = FALSE;
si->small_game_graphics = FALSE;
si->show_load_save_buttons = FALSE;
@@
-11605,13
+11676,14
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->sounds_set = getStringCopy(SND_CLASSIC_SUBDIR);
si->music_set = getStringCopy(MUS_CLASSIC_SUBDIR);
si->sounds_set = getStringCopy(SND_CLASSIC_SUBDIR);
si->music_set = getStringCopy(MUS_CLASSIC_SUBDIR);
- si->override_level_graphics = FALSE;
- si->override_level_sounds = FALSE;
- si->override_level_music = FALSE;
+ si->override_level_graphics =
STATE_
FALSE;
+ si->override_level_sounds =
STATE_
FALSE;
+ si->override_level_music =
STATE_
FALSE;
si->volume_simple = 100; // percent
si->volume_loops = 100; // percent
si->volume_music = 100; // percent
si->volume_simple = 100; // percent
si->volume_loops = 100; // percent
si->volume_music = 100; // percent
+ si->audio_sample_rate_44100 = FALSE;
si->network_mode = FALSE;
si->network_player_nr = 0; // first player
si->network_mode = FALSE;
si->network_player_nr = 0; // first player
@@
-11734,6
+11806,9
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->shortcut.snap_up = DEFAULT_KEY_SNAP_UP;
si->shortcut.snap_down = DEFAULT_KEY_SNAP_DOWN;
si->shortcut.snap_up = DEFAULT_KEY_SNAP_UP;
si->shortcut.snap_down = DEFAULT_KEY_SNAP_DOWN;
+ si->shortcut.speed_fast = DEFAULT_KEY_SPEED_FAST;
+ si->shortcut.speed_slow = DEFAULT_KEY_SPEED_SLOW;
+
for (i = 0; i < MAX_PLAYERS; i++)
{
si->input[i].use_joystick = FALSE;
for (i = 0; i < MAX_PLAYERS; i++)
{
si->input[i].use_joystick = FALSE;
@@
-11813,7
+11888,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->debug.show_frames_per_second = FALSE;
si->debug.show_frames_per_second = FALSE;
- si->debug.xsn_mode = AUTO;
+ si->debug.xsn_mode =
STATE_
AUTO;
si->debug.xsn_percent = 0;
si->options.verbose = FALSE;
si->debug.xsn_percent = 0;
si->options.verbose = FALSE;
@@
-12381,7
+12456,7
@@
void SaveSetup_Default(void)
fprintf(file, "\n");
for (i = 0; i < ARRAY_SIZE(debug_setup_tokens); i++)
if (!strPrefix(debug_setup_tokens[i].text, "debug.xsn_") ||
fprintf(file, "\n");
for (i = 0; i < ARRAY_SIZE(debug_setup_tokens); i++)
if (!strPrefix(debug_setup_tokens[i].text, "debug.xsn_") ||
- setup.debug.xsn_mode != AUTO)
+ setup.debug.xsn_mode !=
STATE_
AUTO)
fprintf(file, "%s\n", getSetupLine(debug_setup_tokens, "", i));
fprintf(file, "\n");
fprintf(file, "%s\n", getSetupLine(debug_setup_tokens, "", i));
fprintf(file, "\n");