projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added setup option to force scroll delay when using the EM engine
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index bc076598094227a1dfece0a6d33d359ff7a2b188..d4751ae52b8a4cfb6622a499e9f4f5d3e302be84 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-768,9
+768,15
@@
static struct LevelFileConfigInfo chunk_config_ELEM[] =
&li.android_clone_time, 10
},
{
&li.android_clone_time, 10
},
{
- EL_EMC_ANDROID,
-1
,
+ EL_EMC_ANDROID,
SAVE_CONF_NEVER
,
TYPE_ELEMENT_LIST, CONF_VALUE_BYTES(1),
&li.android_clone_element[0], EL_EMPTY, NULL,
TYPE_ELEMENT_LIST, CONF_VALUE_BYTES(1),
&li.android_clone_element[0], EL_EMPTY, NULL,
+ &li.num_android_clone_elements, 1, MAX_ANDROID_ELEMENTS_OLD
+ },
+ {
+ EL_EMC_ANDROID, -1,
+ TYPE_ELEMENT_LIST, CONF_VALUE_BYTES(2),
+ &li.android_clone_element[0], EL_EMPTY, NULL,
&li.num_android_clone_elements, 1, MAX_ANDROID_ELEMENTS
},
&li.num_android_clone_elements, 1, MAX_ANDROID_ELEMENTS
},
@@
-8361,6
+8367,10
@@
static struct TokenInfo global_setup_tokens[] =
TYPE_SWITCH,
&setup.scroll_delay, "scroll_delay"
},
TYPE_SWITCH,
&setup.scroll_delay, "scroll_delay"
},
+ {
+ TYPE_SWITCH,
+ &setup.forced_scroll_delay, "forced_scroll_delay"
+ },
{
TYPE_INTEGER,
&setup.scroll_delay_value, "scroll_delay_value"
{
TYPE_INTEGER,
&setup.scroll_delay_value, "scroll_delay_value"
@@
-9106,6
+9116,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->sound_simple = TRUE;
si->toons = TRUE;
si->scroll_delay = TRUE;
si->sound_simple = TRUE;
si->toons = TRUE;
si->scroll_delay = TRUE;
+ si->forced_scroll_delay = FALSE;
si->scroll_delay_value = STD_SCROLL_DELAY;
si->engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_DEFAULT);
si->engine_snapshot_memory = SNAPSHOT_MEMORY_DEFAULT;
si->scroll_delay_value = STD_SCROLL_DELAY;
si->engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_DEFAULT);
si->engine_snapshot_memory = SNAPSHOT_MEMORY_DEFAULT;