rnd-20140114-1-src

[rocksndiamonds.git] / src / conf_var.c

diff --git a/src/conf_var.c b/src/conf_var.c
index 0f2cd01c4b73c353a0f4a22c3da4faacf7171a62..f10abd815428388873e85ca382252be310df4b77 100644 (file)
--- a/src/conf_var.c
+++ b/src/conf_var.c
@@ -936,6 +936,10 @@ struct TokenIntPtrInfo image_config_vars[] =
     "border.draw_masked.LEVELS",
     &border.draw_masked[GFX_SPECIAL_ARG_LEVELS]
   },
+  {
+    "border.draw_masked.LEVELNR",
+    &border.draw_masked[GFX_SPECIAL_ARG_LEVELNR]
+  },
   {
     "border.draw_masked.SCORES",
     &border.draw_masked[GFX_SPECIAL_ARG_SCORES]
@@ -1160,6 +1164,14 @@ struct TokenIntPtrInfo image_config_vars[] =
     "menu.draw_yoffset.LEVELS",
     &menu.draw_yoffset[GFX_SPECIAL_ARG_LEVELS]
   },
+  {
+    "menu.draw_xoffset.LEVELNR",
+    &menu.draw_xoffset[GFX_SPECIAL_ARG_LEVELNR]
+  },
+  {
+    "menu.draw_yoffset.LEVELNR",
+    &menu.draw_yoffset[GFX_SPECIAL_ARG_LEVELNR]
+  },
   {
     "menu.draw_xoffset.SCORES",
     &menu.draw_xoffset[GFX_SPECIAL_ARG_SCORES]
@@ -1328,6 +1340,14 @@ struct TokenIntPtrInfo image_config_vars[] =
     "menu.draw_yoffset.SETUP[SHORTCUTS_4]",
     &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4]
   },
+  {
+    "menu.draw_xoffset.SETUP[SHORTCUTS_5]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_5]
+  },
+  {
+    "menu.draw_yoffset.SETUP[SHORTCUTS_5]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_5]
+  },
   {
     "menu.draw_xoffset.SETUP[CHOOSE_ARTWORK]",
     &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK]
@@ -1356,6 +1376,10 @@ struct TokenIntPtrInfo image_config_vars[] =
     "menu.list_size.LEVELS",
     &menu.list_size[GFX_SPECIAL_ARG_LEVELS]
   },
+  {
+    "menu.list_size.LEVELNR",
+    &menu.list_size[GFX_SPECIAL_ARG_LEVELNR]
+  },
   {
     "menu.list_size.SCORES",
     &menu.list_size[GFX_SPECIAL_ARG_SCORES]
@@ -5060,6 +5084,358 @@ struct TokenIntPtrInfo image_config_vars[] =
     "game.button.sound_simple.y",
     &game.button.sound_simple.y
   },
+  {
+    "tape.button.eject.x",
+    &tape.button.eject.x
+  },
+  {
+    "tape.button.eject.y",
+    &tape.button.eject.y
+  },
+  {
+    "tape.button.stop.x",
+    &tape.button.stop.x
+  },
+  {
+    "tape.button.stop.y",
+    &tape.button.stop.y
+  },
+  {
+    "tape.button.pause.x",
+    &tape.button.pause.x
+  },
+  {
+    "tape.button.pause.y",
+    &tape.button.pause.y
+  },
+  {
+    "tape.button.record.x",
+    &tape.button.record.x
+  },
+  {
+    "tape.button.record.y",
+    &tape.button.record.y
+  },
+  {
+    "tape.button.play.x",
+    &tape.button.play.x
+  },
+  {
+    "tape.button.play.y",
+    &tape.button.play.y
+  },
+  {
+    "tape.symbol.eject.x",
+    &tape.symbol.eject.x
+  },
+  {
+    "tape.symbol.eject.y",
+    &tape.symbol.eject.y
+  },
+  {
+    "tape.symbol.stop.x",
+    &tape.symbol.stop.x
+  },
+  {
+    "tape.symbol.stop.y",
+    &tape.symbol.stop.y
+  },
+  {
+    "tape.symbol.pause.x",
+    &tape.symbol.pause.x
+  },
+  {
+    "tape.symbol.pause.y",
+    &tape.symbol.pause.y
+  },
+  {
+    "tape.symbol.record.x",
+    &tape.symbol.record.x
+  },
+  {
+    "tape.symbol.record.y",
+    &tape.symbol.record.y
+  },
+  {
+    "tape.symbol.play.x",
+    &tape.symbol.play.x
+  },
+  {
+    "tape.symbol.play.y",
+    &tape.symbol.play.y
+  },
+  {
+    "tape.symbol.fast_forward.x",
+    &tape.symbol.fast_forward.x
+  },
+  {
+    "tape.symbol.fast_forward.y",
+    &tape.symbol.fast_forward.y
+  },
+  {
+    "tape.symbol.warp_forward.x",
+    &tape.symbol.warp_forward.x
+  },
+  {
+    "tape.symbol.warp_forward.y",
+    &tape.symbol.warp_forward.y
+  },
+  {
+    "tape.symbol.warp_forward_blind.x",
+    &tape.symbol.warp_forward_blind.x
+  },
+  {
+    "tape.symbol.warp_forward_blind.y",
+    &tape.symbol.warp_forward_blind.y
+  },
+  {
+    "tape.symbol.pause_before_end.x",
+    &tape.symbol.pause_before_end.x
+  },
+  {
+    "tape.symbol.pause_before_end.y",
+    &tape.symbol.pause_before_end.y
+  },
+  {
+    "tape.symbol.single_step.x",
+    &tape.symbol.single_step.x
+  },
+  {
+    "tape.symbol.single_step.y",
+    &tape.symbol.single_step.y
+  },
+  {
+    "tape.label.eject.x",
+    &tape.label.eject.x
+  },
+  {
+    "tape.label.eject.y",
+    &tape.label.eject.y
+  },
+  {
+    "tape.label.stop.x",
+    &tape.label.stop.x
+  },
+  {
+    "tape.label.stop.y",
+    &tape.label.stop.y
+  },
+  {
+    "tape.label.pause.x",
+    &tape.label.pause.x
+  },
+  {
+    "tape.label.pause.y",
+    &tape.label.pause.y
+  },
+  {
+    "tape.label.record.x",
+    &tape.label.record.x
+  },
+  {
+    "tape.label.record.y",
+    &tape.label.record.y
+  },
+  {
+    "tape.label.play.x",
+    &tape.label.play.x
+  },
+  {
+    "tape.label.play.y",
+    &tape.label.play.y
+  },
+  {
+    "tape.label.fast_forward.x",
+    &tape.label.fast_forward.x
+  },
+  {
+    "tape.label.fast_forward.y",
+    &tape.label.fast_forward.y
+  },
+  {
+    "tape.label.warp_forward.x",
+    &tape.label.warp_forward.x
+  },
+  {
+    "tape.label.warp_forward.y",
+    &tape.label.warp_forward.y
+  },
+  {
+    "tape.label.warp_forward_blind.x",
+    &tape.label.warp_forward_blind.x
+  },
+  {
+    "tape.label.warp_forward_blind.y",
+    &tape.label.warp_forward_blind.y
+  },
+  {
+    "tape.label.pause_before_end.x",
+    &tape.label.pause_before_end.x
+  },
+  {
+    "tape.label.pause_before_end.y",
+    &tape.label.pause_before_end.y
+  },
+  {
+    "tape.label.single_step.x",
+    &tape.label.single_step.x
+  },
+  {
+    "tape.label.single_step.y",
+    &tape.label.single_step.y
+  },
+  {
+    "tape.label.date.x",
+    &tape.label.date.x
+  },
+  {
+    "tape.label.date.y",
+    &tape.label.date.y
+  },
+  {
+    "tape.label.time.x",
+    &tape.label.time.x
+  },
+  {
+    "tape.label.time.y",
+    &tape.label.time.y
+  },
+  {
+    "tape.text.date.x",
+    &tape.text.date.x
+  },
+  {
+    "tape.text.date.y",
+    &tape.text.date.y
+  },
+  {
+    "tape.text.date.align",
+    &tape.text.date.align
+  },
+  {
+    "tape.text.date.valign",
+    &tape.text.date.valign
+  },
+  {
+    "tape.text.date.digits",
+    &tape.text.date.size
+  },
+  {
+    "tape.text.date.font",
+    &tape.text.date.font
+  },
+  {
+    "tape.text.time.x",
+    &tape.text.time.x
+  },
+  {
+    "tape.text.time.y",
+    &tape.text.time.y
+  },
+  {
+    "tape.text.time.align",
+    &tape.text.time.align
+  },
+  {
+    "tape.text.time.valign",
+    &tape.text.time.valign
+  },
+  {
+    "tape.text.time.digits",
+    &tape.text.time.size
+  },
+  {
+    "tape.text.time.font",
+    &tape.text.time.font
+  },
+  {
+    "request.button.yes.x",
+    &request.button.yes.x
+  },
+  {
+    "request.button.yes.y",
+    &request.button.yes.y
+  },
+  {
+    "request.button.no.x",
+    &request.button.no.x
+  },
+  {
+    "request.button.no.y",
+    &request.button.no.y
+  },
+  {
+    "request.button.confirm.x",
+    &request.button.confirm.x
+  },
+  {
+    "request.button.confirm.y",
+    &request.button.confirm.y
+  },
+  {
+    "request.button.player_1.x",
+    &request.button.player_1.x
+  },
+  {
+    "request.button.player_1.y",
+    &request.button.player_1.y
+  },
+  {
+    "request.button.player_1.draw_player",
+    &request.button.player_1.draw_player
+  },
+  {
+    "request.button.player_1.tile_size",
+    &request.button.player_1.size
+  },
+  {
+    "request.button.player_2.x",
+    &request.button.player_2.x
+  },
+  {
+    "request.button.player_2.y",
+    &request.button.player_2.y
+  },
+  {
+    "request.button.player_2.draw_player",
+    &request.button.player_2.draw_player
+  },
+  {
+    "request.button.player_2.tile_size",
+    &request.button.player_2.size
+  },
+  {
+    "request.button.player_3.x",
+    &request.button.player_3.x
+  },
+  {
+    "request.button.player_3.y",
+    &request.button.player_3.y
+  },
+  {
+    "request.button.player_3.draw_player",
+    &request.button.player_3.draw_player
+  },
+  {
+    "request.button.player_3.tile_size",
+    &request.button.player_3.size
+  },
+  {
+    "request.button.player_4.x",
+    &request.button.player_4.x
+  },
+  {
+    "request.button.player_4.y",
+    &request.button.player_4.y
+  },
+  {
+    "request.button.player_4.draw_player",
+    &request.button.player_4.draw_player
+  },
+  {
+    "request.button.player_4.tile_size",
+    &request.button.player_4.size
+  },
   {
     "game.forced_scroll_delay_value",
     &game.forced_scroll_delay_value
@@ -5076,6 +5452,10 @@ struct TokenIntPtrInfo image_config_vars[] =
     "game.use_masked_pushing",
     &game.use_masked_pushing
   },
+  {
+    "game.tile_size",
+    &game.tile_size
+  },
   {
     "[player].boring_delay_fixed",
     &game.player_boring_delay_fixed
@@ -5101,76 +5481,148 @@ struct TokenIntPtrInfo image_config_vars[] =
     &viewport.window.height
   },
   {
-    "viewport.playfield.menu.width",
-    &viewport.playfield.menu.width
+    "viewport.playfield.x",
+    &viewport.playfield[GFX_SPECIAL_ARG_DEFAULT].x
+  },
+  {
+    "viewport.playfield.y",
+    &viewport.playfield[GFX_SPECIAL_ARG_DEFAULT].y
+  },
+  {
+    "viewport.playfield.width",
+    &viewport.playfield[GFX_SPECIAL_ARG_DEFAULT].width
+  },
+  {
+    "viewport.playfield.height",
+    &viewport.playfield[GFX_SPECIAL_ARG_DEFAULT].height
+  },
+  {
+    "viewport.playfield.border_size",
+    &viewport.playfield[GFX_SPECIAL_ARG_DEFAULT].border_size
+  },
+  {
+    "viewport.playfield.MAIN.x",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].x
+  },
+  {
+    "viewport.playfield.MAIN.y",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].y
+  },
+  {
+    "viewport.playfield.MAIN.width",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].width
+  },
+  {
+    "viewport.playfield.MAIN.height",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].height
+  },
+  {
+    "viewport.playfield.MAIN.border_size",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].border_size
+  },
+  {
+    "viewport.playfield.PLAYING.x",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].x
+  },
+  {
+    "viewport.playfield.PLAYING.y",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].y
+  },
+  {
+    "viewport.playfield.PLAYING.width",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].width
+  },
+  {
+    "viewport.playfield.PLAYING.height",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].height
+  },
+  {
+    "viewport.playfield.PLAYING.border_size",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].border_size
+  },
+  {
+    "viewport.playfield.EDITOR.x",
+    &viewport.playfield[GFX_SPECIAL_ARG_EDITOR].x
+  },
+  {
+    "viewport.playfield.EDITOR.y",
+    &viewport.playfield[GFX_SPECIAL_ARG_EDITOR].y
+  },
+  {
+    "viewport.playfield.EDITOR.width",
+    &viewport.playfield[GFX_SPECIAL_ARG_EDITOR].width
+  },
+  {
+    "viewport.playfield.EDITOR.height",
+    &viewport.playfield[GFX_SPECIAL_ARG_EDITOR].height
   },
   {
-    "viewport.playfield.menu.height",
-    &viewport.playfield.menu.height
+    "viewport.playfield.EDITOR.border_size",
+    &viewport.playfield[GFX_SPECIAL_ARG_EDITOR].border_size
   },
   {
-    "viewport.playfield.game.width",
-    &viewport.playfield.game.width
+    "viewport.door_1.x",
+    &viewport.door_1[GFX_SPECIAL_ARG_DEFAULT].x
   },
   {
-    "viewport.playfield.game.height",
-    &viewport.playfield.game.height
+    "viewport.door_1.y",
+    &viewport.door_1[GFX_SPECIAL_ARG_DEFAULT].y
   },
   {
-    "viewport.playfield.editor.width",
-    &viewport.playfield.editor.width
+    "viewport.door_1.MAIN.x",
+    &viewport.door_1[GFX_SPECIAL_ARG_MAIN].x
   },
   {
-    "viewport.playfield.editor.height",
-    &viewport.playfield.editor.height
+    "viewport.door_1.MAIN.y",
+    &viewport.door_1[GFX_SPECIAL_ARG_MAIN].y
   },
   {
-    "viewport.door_1.menu.x",
-    &viewport.door_1.menu.x
+    "viewport.door_1.PLAYING.x",
+    &viewport.door_1[GFX_SPECIAL_ARG_PLAYING].x
   },
   {
-    "viewport.door_1.menu.y",
-    &viewport.door_1.menu.y
+    "viewport.door_1.PLAYING.y",
+    &viewport.door_1[GFX_SPECIAL_ARG_PLAYING].y
   },
   {
-    "viewport.door_1.game.x",
-    &viewport.door_1.game.x
+    "viewport.door_1.EDITOR.x",
+    &viewport.door_1[GFX_SPECIAL_ARG_EDITOR].x
   },
   {
-    "viewport.door_1.game.y",
-    &viewport.door_1.game.y
+    "viewport.door_1.EDITOR.y",
+    &viewport.door_1[GFX_SPECIAL_ARG_EDITOR].y
   },
   {
-    "viewport.door_1.editor.x",
-    &viewport.door_1.editor.x
+    "viewport.door_2.x",
+    &viewport.door_2[GFX_SPECIAL_ARG_DEFAULT].x
   },
   {
-    "viewport.door_1.editor.y",
-    &viewport.door_1.editor.y
+    "viewport.door_2.y",
+    &viewport.door_2[GFX_SPECIAL_ARG_DEFAULT].y
   },
   {
-    "viewport.door_2.menu.x",
-    &viewport.door_2.menu.x
+    "viewport.door_2.MAIN.x",
+    &viewport.door_2[GFX_SPECIAL_ARG_MAIN].x
   },
   {
-    "viewport.door_2.menu.y",
-    &viewport.door_2.menu.y
+    "viewport.door_2.MAIN.y",
+    &viewport.door_2[GFX_SPECIAL_ARG_MAIN].y
   },
   {
-    "viewport.door_2.game.x",
-    &viewport.door_2.game.x
+    "viewport.door_2.PLAYING.x",
+    &viewport.door_2[GFX_SPECIAL_ARG_PLAYING].x
   },
   {
-    "viewport.door_2.game.y",
-    &viewport.door_2.game.y
+    "viewport.door_2.PLAYING.y",
+    &viewport.door_2[GFX_SPECIAL_ARG_PLAYING].y
   },
   {
-    "viewport.door_2.editor.x",
-    &viewport.door_2.editor.x
+    "viewport.door_2.EDITOR.x",
+    &viewport.door_2[GFX_SPECIAL_ARG_EDITOR].x
   },
   {
-    "viewport.door_2.editor.y",
-    &viewport.door_2.editor.y
+    "viewport.door_2.EDITOR.y",
+    &viewport.door_2[GFX_SPECIAL_ARG_EDITOR].y
   },
   {
     NULL,