projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
conf_var.c
diff --git
a/src/conf_var.c
b/src/conf_var.c
index 47937e01f219e8c35a4b4637ca1599c34bcc72c3..4a6389ad826491c77359b4429925038f8c73162b 100644
(file)
--- a/
src/conf_var.c
+++ b/
src/conf_var.c
@@
-960,6
+960,26
@@
struct TokenIntPtrInfo image_config_vars[] =
"border.draw_masked.DOOR",
&border.draw_masked[GFX_SPECIAL_ARG_DOOR]
},
"border.draw_masked.DOOR",
&border.draw_masked[GFX_SPECIAL_ARG_DOOR]
},
+ {
+ "border.draw_masked_when_fading",
+ &border.draw_masked_when_fading
+ },
+ {
+ "init.busy.x",
+ &init.busy.x
+ },
+ {
+ "init.busy.y",
+ &init.busy.y
+ },
+ {
+ "init.busy.align",
+ &init.busy.align
+ },
+ {
+ "init.busy.valign",
+ &init.busy.valign
+ },
{
"menu.enter_menu.fade_mode",
&menu.enter_menu.fade_mode
{
"menu.enter_menu.fade_mode",
&menu.enter_menu.fade_mode
@@
-996,6
+1016,18
@@
struct TokenIntPtrInfo image_config_vars[] =
"menu.enter_screen.post_delay",
&menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT].post_delay
},
"menu.enter_screen.post_delay",
&menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT].post_delay
},
+ {
+ "menu.next_screen.fade_mode",
+ &menu.next_screen.fade_mode
+ },
+ {
+ "menu.next_screen.fade_delay",
+ &menu.next_screen.fade_delay
+ },
+ {
+ "menu.next_screen.post_delay",
+ &menu.next_screen.post_delay
+ },
{
"menu.leave_screen.fade_mode",
&menu.leave_screen[GFX_SPECIAL_ARG_DEFAULT].fade_mode
{
"menu.leave_screen.fade_mode",
&menu.leave_screen[GFX_SPECIAL_ARG_DEFAULT].fade_mode
@@
-4944,6
+4976,10
@@
struct TokenIntPtrInfo image_config_vars[] =
"game.forced_scroll_delay_value",
&game.forced_scroll_delay_value
},
"game.forced_scroll_delay_value",
&game.forced_scroll_delay_value
},
+ {
+ "game.use_native_emc_graphics_engine",
+ &game.use_native_emc_graphics_engine
+ },
{
"[player].boring_delay_fixed",
&game.player_boring_delay_fixed
{
"[player].boring_delay_fixed",
&game.player_boring_delay_fixed