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_gfx.c
diff --git
a/src/conf_gfx.c
b/src/conf_gfx.c
index 139b61b413c97549e0d113821ad3a01fec8fb904..f3bebdf5960ce02388e8a476cf51f2ce445e6383 100644
(file)
--- a/
src/conf_gfx.c
+++ b/
src/conf_gfx.c
@@
-4684,6
+4684,8
@@
struct ConfigInfo image_config[] =
{ "font.title_2.y", "0" },
{ "font.title_2.width", "14" },
{ "font.title_2.height", "14" },
{ "font.title_2.y", "0" },
{ "font.title_2.width", "14" },
{ "font.title_2.height", "14" },
+ { "font.title_2.SETUP", UNDEFINED_FILENAME },
+ { "font.title_2.SETUP.clone_from", "font.text_4" },
{ "font.menu_1", "RocksFontBig.pcx" },
{ "font.menu_1.x", "0" },
{ "font.menu_1", "RocksFontBig.pcx" },
{ "font.menu_1.x", "0" },
@@
-5298,6
+5300,9
@@
struct ConfigInfo image_config[] =
{ "menu.enter_screen.fade_mode", "fade" },
{ "menu.enter_screen.fade_delay", "250" },
{ "menu.enter_screen.post_delay", "125" },
{ "menu.enter_screen.fade_mode", "fade" },
{ "menu.enter_screen.fade_delay", "250" },
{ "menu.enter_screen.post_delay", "125" },
+ { "menu.next_screen.fade_mode", "crossfade" },
+ { "menu.next_screen.fade_delay", "250" },
+ { "menu.next_screen.post_delay", "125" },
{ "menu.leave_screen.fade_mode", "fade" },
{ "menu.leave_screen.fade_delay", "250" },
{ "menu.leave_screen.post_delay", "125" },
{ "menu.leave_screen.fade_mode", "fade" },
{ "menu.leave_screen.fade_delay", "250" },
{ "menu.leave_screen.post_delay", "125" },