projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed showing standard element properties for some engines in editor
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index ec25f0b25ba0852ebf92261e9e4cbc889105193f..587e71b956c02b45bd64682399db1464b1c2477f 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-10771,10
+10771,26
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_SWITCH,
&setup.bd_scroll_delay, "bd_scroll_delay"
},
TYPE_SWITCH,
&setup.bd_scroll_delay, "bd_scroll_delay"
},
+ {
+ TYPE_SWITCH,
+ &setup.bd_show_invisible_outbox, "bd_show_invisible_outbox"
+ },
{
TYPE_SWITCH3,
&setup.bd_smooth_movements, "bd_smooth_movements"
},
{
TYPE_SWITCH3,
&setup.bd_smooth_movements, "bd_smooth_movements"
},
+ {
+ TYPE_SWITCH3,
+ &setup.bd_pushing_graphics, "bd_pushing_graphics"
+ },
+ {
+ TYPE_SWITCH3,
+ &setup.bd_up_down_graphics, "bd_up_down_graphics"
+ },
+ {
+ TYPE_SWITCH3,
+ &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"
@@
-10851,6
+10867,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"
@@
-11171,6
+11191,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;
@@
-11412,6
+11440,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"
@@
-11619,7
+11651,11
@@
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_show_invisible_outbox = FALSE;
si->bd_smooth_movements = AUTO;
si->bd_smooth_movements = AUTO;
+ si->bd_pushing_graphics = TRUE;
+ si->bd_up_down_graphics = TRUE;
+ si->bd_skip_falling_sounds = 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_palette_c64 = GD_DEFAULT_PALETTE_C64;
si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
@@
-11642,6
+11678,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
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
@@
-11764,6
+11801,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;