X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_var.c;h=e12f0015938b77fd769bb1a0c30248caab987ee6;hb=41def9c1d8c6939b8754fdab43579272e49d4da4;hp=0f2cd01c4b73c353a0f4a22c3da4faacf7171a62;hpb=5cdf02eb2a6d9627f7461ab9d386698cb7596096;p=rocksndiamonds.git

diff --git a/src/conf_var.c b/src/conf_var.c
index 0f2cd01c..e12f0015 100644
--- a/src/conf_var.c
+++ b/src/conf_var.c
@@ -5101,76 +5101,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.menu.height",
-    &viewport.playfield.menu.height
+    "viewport.playfield.y",
+    &viewport.playfield[GFX_SPECIAL_ARG_DEFAULT].y
   },
   {
-    "viewport.playfield.game.width",
-    &viewport.playfield.game.width
+    "viewport.playfield.width",
+    &viewport.playfield[GFX_SPECIAL_ARG_DEFAULT].width
   },
   {
-    "viewport.playfield.game.height",
-    &viewport.playfield.game.height
+    "viewport.playfield.height",
+    &viewport.playfield[GFX_SPECIAL_ARG_DEFAULT].height
   },
   {
-    "viewport.playfield.editor.width",
-    &viewport.playfield.editor.width
+    "viewport.playfield.border_size",
+    &viewport.playfield[GFX_SPECIAL_ARG_DEFAULT].border_size
   },
   {
-    "viewport.playfield.editor.height",
-    &viewport.playfield.editor.height
+    "viewport.playfield.MAIN.x",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].x
   },
   {
-    "viewport.door_1.menu.x",
-    &viewport.door_1.menu.x
+    "viewport.playfield.MAIN.y",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].y
   },
   {
-    "viewport.door_1.menu.y",
-    &viewport.door_1.menu.y
+    "viewport.playfield.MAIN.width",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].width
   },
   {
-    "viewport.door_1.game.x",
-    &viewport.door_1.game.x
+    "viewport.playfield.MAIN.height",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].height
   },
   {
-    "viewport.door_1.game.y",
-    &viewport.door_1.game.y
+    "viewport.playfield.MAIN.border_size",
+    &viewport.playfield[GFX_SPECIAL_ARG_MAIN].border_size
   },
   {
-    "viewport.door_1.editor.x",
-    &viewport.door_1.editor.x
+    "viewport.playfield.PLAYING.x",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].x
   },
   {
-    "viewport.door_1.editor.y",
-    &viewport.door_1.editor.y
+    "viewport.playfield.PLAYING.y",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].y
   },
   {
-    "viewport.door_2.menu.x",
-    &viewport.door_2.menu.x
+    "viewport.playfield.PLAYING.width",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].width
   },
   {
-    "viewport.door_2.menu.y",
-    &viewport.door_2.menu.y
+    "viewport.playfield.PLAYING.height",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].height
   },
   {
-    "viewport.door_2.game.x",
-    &viewport.door_2.game.x
+    "viewport.playfield.PLAYING.border_size",
+    &viewport.playfield[GFX_SPECIAL_ARG_PLAYING].border_size
   },
   {
-    "viewport.door_2.game.y",
-    &viewport.door_2.game.y
+    "viewport.playfield.EDITOR.x",
+    &viewport.playfield[GFX_SPECIAL_ARG_EDITOR].x
   },
   {
-    "viewport.door_2.editor.x",
-    &viewport.door_2.editor.x
+    "viewport.playfield.EDITOR.y",
+    &viewport.playfield[GFX_SPECIAL_ARG_EDITOR].y
   },
   {
-    "viewport.door_2.editor.y",
-    &viewport.door_2.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.EDITOR.border_size",
+    &viewport.playfield[GFX_SPECIAL_ARG_EDITOR].border_size
+  },
+  {
+    "viewport.door_1.x",
+    &viewport.door_1[GFX_SPECIAL_ARG_DEFAULT].x
+  },
+  {
+    "viewport.door_1.y",
+    &viewport.door_1[GFX_SPECIAL_ARG_DEFAULT].y
+  },
+  {
+    "viewport.door_1.MAIN.x",
+    &viewport.door_1[GFX_SPECIAL_ARG_MAIN].x
+  },
+  {
+    "viewport.door_1.MAIN.y",
+    &viewport.door_1[GFX_SPECIAL_ARG_MAIN].y
+  },
+  {
+    "viewport.door_1.PLAYING.x",
+    &viewport.door_1[GFX_SPECIAL_ARG_PLAYING].x
+  },
+  {
+    "viewport.door_1.PLAYING.y",
+    &viewport.door_1[GFX_SPECIAL_ARG_PLAYING].y
+  },
+  {
+    "viewport.door_1.EDITOR.x",
+    &viewport.door_1[GFX_SPECIAL_ARG_EDITOR].x
+  },
+  {
+    "viewport.door_1.EDITOR.y",
+    &viewport.door_1[GFX_SPECIAL_ARG_EDITOR].y
+  },
+  {
+    "viewport.door_2.x",
+    &viewport.door_2[GFX_SPECIAL_ARG_DEFAULT].x
+  },
+  {
+    "viewport.door_2.y",
+    &viewport.door_2[GFX_SPECIAL_ARG_DEFAULT].y
+  },
+  {
+    "viewport.door_2.MAIN.x",
+    &viewport.door_2[GFX_SPECIAL_ARG_MAIN].x
+  },
+  {
+    "viewport.door_2.MAIN.y",
+    &viewport.door_2[GFX_SPECIAL_ARG_MAIN].y
+  },
+  {
+    "viewport.door_2.PLAYING.x",
+    &viewport.door_2[GFX_SPECIAL_ARG_PLAYING].x
+  },
+  {
+    "viewport.door_2.PLAYING.y",
+    &viewport.door_2[GFX_SPECIAL_ARG_PLAYING].y
+  },
+  {
+    "viewport.door_2.EDITOR.x",
+    &viewport.door_2[GFX_SPECIAL_ARG_EDITOR].x
+  },
+  {
+    "viewport.door_2.EDITOR.y",
+    &viewport.door_2[GFX_SPECIAL_ARG_EDITOR].y
   },
   {
     NULL,