projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added variable to store if request dialog event was processed
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 8cb6ec6e3bb879214a56dccee9813f17db73645b..271e428395d6a30d2d832fe6f0ff5aaed6c12d1b 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-8545,6
+8545,10
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_SWITCH,
&setup.prefer_lowpass_sounds, "prefer_lowpass_sounds"
},
TYPE_SWITCH,
&setup.prefer_lowpass_sounds, "prefer_lowpass_sounds"
},
+ {
+ TYPE_SWITCH,
+ &setup.prefer_extra_panel_items, "prefer_extra_panel_items"
+ },
{
TYPE_SWITCH,
&setup.game_speed_extended, "game_speed_extended"
{
TYPE_SWITCH,
&setup.game_speed_extended, "game_speed_extended"
@@
-9177,10
+9181,9
@@
static struct TokenInfo options_setup_tokens[] =
static void setSetupInfoToDefaults(struct SetupInfo *si)
{
static void setSetupInfoToDefaults(struct SetupInfo *si)
{
- char *player_name = (user.nr == 0 ? getLoginName() : EMPTY_PLAYER_NAME);
int i;
int i;
- si->player_name = get
FixedUserName(player_name
);
+ si->player_name = get
StringCopy(getDefaultUserName(user.nr)
);
si->multiple_users = TRUE;
si->multiple_users = TRUE;
@@
-9217,6
+9220,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->input_on_focus = FALSE;
si->prefer_aga_graphics = TRUE;
si->prefer_lowpass_sounds = FALSE;
si->input_on_focus = FALSE;
si->prefer_aga_graphics = TRUE;
si->prefer_lowpass_sounds = FALSE;
+ si->prefer_extra_panel_items = TRUE;
si->game_speed_extended = FALSE;
si->game_frame_delay = GAME_FRAME_DELAY;
si->sp_show_border_elements = FALSE;
si->game_speed_extended = FALSE;
si->game_frame_delay = GAME_FRAME_DELAY;
si->sp_show_border_elements = FALSE;
@@
-9674,7
+9678,7
@@
void LoadUserNames(void)
}
if (global.user_names[i] == NULL)
}
if (global.user_names[i] == NULL)
- global.user_names[i] = getStringCopy(
EMPTY_PLAYER_NAME
);
+ global.user_names[i] = getStringCopy(
getDefaultUserName(i)
);
}
user.nr = last_user_nr;
}
user.nr = last_user_nr;
@@
-10451,6
+10455,9
@@
int get_parameter_value(char *value_raw, char *suffix, int type)
if (string_has_parameter(value, "reverse"))
result |= STYLE_REVERSE;
if (string_has_parameter(value, "reverse"))
result |= STYLE_REVERSE;
+ if (string_has_parameter(value, "leftmost_position"))
+ result |= STYLE_LEFTMOST_POSITION;
+
if (string_has_parameter(value, "block_clicks"))
result |= STYLE_BLOCK;
if (string_has_parameter(value, "block_clicks"))
result |= STYLE_BLOCK;