projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic-tilesize-cleanup'
[rocksndiamonds.git]
/
src
/
conf_var.c
diff --git
a/src/conf_var.c
b/src/conf_var.c
index 239c6030b807fc480296eb1b47dfd9a6e3b1916b..635fd08a32b35f7b60652ed961821cfd1525edd6 100644
(file)
--- a/
src/conf_var.c
+++ b/
src/conf_var.c
@@
-1300,6
+1300,14
@@
struct TokenIntPtrInfo image_config_vars[] =
"menu.draw_yoffset.SETUP[INPUT]",
&menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_INPUT]
},
"menu.draw_yoffset.SETUP[INPUT]",
&menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_INPUT]
},
+ {
+ "menu.draw_xoffset.SETUP[TOUCH]",
+ &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_TOUCH]
+ },
+ {
+ "menu.draw_yoffset.SETUP[TOUCH]",
+ &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_TOUCH]
+ },
{
"menu.draw_xoffset.SETUP[SHORTCUTS]",
&menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS]
{
"menu.draw_xoffset.SETUP[SHORTCUTS]",
&menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS]
@@
-5804,6
+5812,22
@@
struct TokenIntPtrInfo image_config_vars[] =
"game.button.sound_simple.y",
&game.button.sound_simple.y
},
"game.button.sound_simple.y",
&game.button.sound_simple.y
},
+ {
+ "game.button.save.x",
+ &game.button.save.x
+ },
+ {
+ "game.button.save.y",
+ &game.button.save.y
+ },
+ {
+ "game.button.load.x",
+ &game.button.load.x
+ },
+ {
+ "game.button.load.y",
+ &game.button.load.y
+ },
{
"tape.button.eject.x",
&tape.button.eject.x
{
"tape.button.eject.x",
&tape.button.eject.x
@@
-6068,6
+6092,10
@@
struct TokenIntPtrInfo image_config_vars[] =
"tape.text.time.font",
&tape.text.time.font
},
"tape.text.time.font",
&tape.text.time.font
},
+ {
+ "tape.show_game_buttons",
+ &tape.show_game_buttons
+ },
{
"editor.palette.x",
&editor.palette.x
{
"editor.palette.x",
&editor.palette.x
@@
-6085,28
+6113,28
@@
struct TokenIntPtrInfo image_config_vars[] =
&editor.palette.rows
},
{
&editor.palette.rows
},
{
- "editor.element_left.x",
- &editor.element_left.x
+ "editor.
palette.
element_left.x",
+ &editor.
palette.
element_left.x
},
{
},
{
- "editor.element_left.y",
- &editor.element_left.y
+ "editor.
palette.
element_left.y",
+ &editor.
palette.
element_left.y
},
{
},
{
- "editor.element_middle.x",
- &editor.element_middle.x
+ "editor.
palette.
element_middle.x",
+ &editor.
palette.
element_middle.x
},
{
},
{
- "editor.element_middle.y",
- &editor.element_middle.y
+ "editor.
palette.
element_middle.y",
+ &editor.
palette.
element_middle.y
},
{
},
{
- "editor.element_right.x",
- &editor.element_right.x
+ "editor.
palette.
element_right.x",
+ &editor.
palette.
element_right.x
},
{
},
{
- "editor.element_right.y",
- &editor.element_right.y
+ "editor.
palette.
element_right.y",
+ &editor.
palette.
element_right.y
},
{
"request.button.yes.x",
},
{
"request.button.yes.x",