rnd-20140219-1-src

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 4c7a117f890ee24df18e5da0ccd90c62ea9a47ba..12da9382a181511194f545b340208d962905bbce 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -79,6 +79,10 @@ struct ConfigTypeInfo image_config_suffix[] =
 
 struct ConfigInfo image_config[] =
 {
+  // ==========================================================================
+  // image definitions for game elements (for in-game and editor graphics)
+  // ==========================================================================
+
   /* images for Boulder Dash style elements and actions */
 
   { "bd_wall",                                 "RocksDC.png"           },
@@ -4366,7 +4370,11 @@ struct ConfigInfo image_config[] =
 #include "conf_cus.c"  /* include auto-generated data structure definitions */
 #include "conf_grp.c"  /* include auto-generated data structure definitions */
 
-  /* images not associated to game elements (used for menu screens etc.) */
+
+  // ==========================================================================
+  // image definitions not associated with game elements (menu screens etc.)
+  // ==========================================================================
+
   /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */
 
 #if 1
@@ -4859,8 +4867,12 @@ struct ConfigInfo image_config[] =
   { "tape.label.gfx.date.x",                   "305"                   },
   { "tape.label.gfx.date.y",                   "285"                   },
   { "tape.label.gfx.date.width",               "90"                    },
-  { "tape.label.gfx.date.height",              "13"                    },
-  { "tape.label.gfx.time",                     UNDEFINED_FILENAME      },
+  { "tape.label.gfx.date.height",              "31"                    },
+  { "tape.label.gfx.time",                     "RocksDoor.png"         },
+  { "tape.label.gfx.time.x",                   "345"                   },
+  { "tape.label.gfx.time.y",                   "335"                   },
+  { "tape.label.gfx.time.width",               "45"                    },
+  { "tape.label.gfx.time.height",              "13"                    },
 
   { "request.button.gfx.yes",                  "RocksDoor.png"         },
   { "request.button.gfx.yes.x",                        "302"                   },
@@ -5312,6 +5324,43 @@ struct ConfigInfo image_config[] =
   { "titlescreen_4",                           UNDEFINED_FILENAME      },
   { "titlescreen_5",                           UNDEFINED_FILENAME      },
 
+  { "door_1.wing_left",                                "RocksDoor.png"         },
+  { "door_1.wing_left.x",                      "0"                     },
+  { "door_1.wing_left.y",                      "0"                     },
+  { "door_1.wing_left.width",                  "100"                   },
+  { "door_1.wing_left.height",                 "280"                   },
+  { "door_1.wing_right",                       "RocksDoor.png"         },
+  { "door_1.wing_right.x",                     "100"                   },
+  { "door_1.wing_right.y",                     "0"                     },
+  { "door_1.wing_right.width",                 "100"                   },
+  { "door_1.wing_right.height",                        "280"                   },
+
+  { "door_2.wing_left",                                "RocksDoor.png"         },
+  { "door_2.wing_left.x",                      "0"                     },
+  { "door_2.wing_left.y",                      "280"                   },
+  { "door_2.wing_left.width",                  "100"                   },
+  { "door_2.wing_left.height",                 "100"                   },
+  { "door_2.wing_right",                       "RocksDoor.png"         },
+  { "door_2.wing_right.x",                     "100"                   },
+  { "door_2.wing_right.y",                     "280"                   },
+  { "door_2.wing_right.width",                 "100"                   },
+  { "door_2.wing_right.height",                        "100"                   },
+
+  { "door_2.top_border_correction",            "RocksDoor.png"         },
+  { "door_2.top_border_correction.x",          "600"                   },
+  { "door_2.top_border_correction.y",          "0"                     },
+  { "door_2.top_border_correction.width",      "108"                   },
+  { "door_2.top_border_correction.height",     "8"                     },
+
+  /* the last image entry apparently gets overwritten by very last entry
+     of "image_config[]"; so far this bug could not be found and fixed */
+  { "last_image_entry_bug",                    UNDEFINED_FILENAME      },
+
+
+  // ==========================================================================
+  // non-image definitions
+  // ==========================================================================
+
   /* the following directives are not associated with an image, but
      probably make sense to be defined in "graphicsinfo.conf", too */
 
@@ -6691,8 +6740,8 @@ struct ConfigInfo image_config[] =
 
   { "tape.label.date.x",                       "5"                     },
   { "tape.label.date.y",                       "5"                     },
-  { "tape.label.time.x",                       "-1"                    },
-  { "tape.label.time.y",                       "-1"                    },
+  { "tape.label.time.x",                       "45"                    },
+  { "tape.label.time.y",                       "55"                    },
 
   { "tape.text.date.x",                                "7"                     },
   { "tape.text.date.y",                                "19"                    },
@@ -6740,6 +6789,9 @@ struct ConfigInfo image_config[] =
   { "request.step_offset",                     "10"                    },
   { "request.step_delay",                      "20"                    },
   { "request.anim_mode",                       "default"               },
+  { "request.autowrap",                                "false"                 },
+  { "request.centered",                                "true"                  },
+  { "request.wrap_single_words",               "true"                  },
 
   { "global.use_envelope_request",             "false"                 },
 
@@ -6778,20 +6830,44 @@ struct ConfigInfo image_config[] =
   { "viewport.playfield.EDITOR.border_size",   ARG_DEFAULT             },
   { "viewport.door_1.x",                       "566"                   },
   { "viewport.door_1.y",                       "60"                    },
+  { "viewport.door_1.width",                   "100"                   },
+  { "viewport.door_1.height",                  "280"                   },
+  { "viewport.door_1.border_size",             "4"                     },
   { "viewport.door_1.MAIN.x",                  ARG_DEFAULT             },
   { "viewport.door_1.MAIN.y",                  ARG_DEFAULT             },
+  { "viewport.door_1.MAIN.width",              ARG_DEFAULT             },
+  { "viewport.door_1.MAIN.height",             ARG_DEFAULT             },
+  { "viewport.door_1.MAIN.border_size",                ARG_DEFAULT             },
   { "viewport.door_1.PLAYING.x",               ARG_DEFAULT             },
   { "viewport.door_1.PLAYING.y",               ARG_DEFAULT             },
+  { "viewport.door_1.PLAYING.width",           ARG_DEFAULT             },
+  { "viewport.door_1.PLAYING.height",          ARG_DEFAULT             },
+  { "viewport.door_1.PLAYING.border_size",     ARG_DEFAULT             },
   { "viewport.door_1.EDITOR.x",                        ARG_DEFAULT             },
   { "viewport.door_1.EDITOR.y",                        ARG_DEFAULT             },
+  { "viewport.door_1.EDITOR.width",            ARG_DEFAULT             },
+  { "viewport.door_1.EDITOR.height",           ARG_DEFAULT             },
+  { "viewport.door_1.EDITOR.border_size",      ARG_DEFAULT             },
   { "viewport.door_2.x",                       "566"                   },
   { "viewport.door_2.y",                       "400"                   },
+  { "viewport.door_2.width",                   "100"                   },
+  { "viewport.door_2.height",                  "100"                   },
+  { "viewport.door_2.border_size",             "4"                     },
   { "viewport.door_2.MAIN.x",                  ARG_DEFAULT             },
   { "viewport.door_2.MAIN.y",                  ARG_DEFAULT             },
+  { "viewport.door_2.MAIN.width",              ARG_DEFAULT             },
+  { "viewport.door_2.MAIN.height",             ARG_DEFAULT             },
+  { "viewport.door_2.MAIN.border_size",                ARG_DEFAULT             },
   { "viewport.door_2.PLAYING.x",               ARG_DEFAULT             },
   { "viewport.door_2.PLAYING.y",               ARG_DEFAULT             },
+  { "viewport.door_2.PLAYING.width",           ARG_DEFAULT             },
+  { "viewport.door_2.PLAYING.height",          ARG_DEFAULT             },
+  { "viewport.door_2.PLAYING.border_size",     ARG_DEFAULT             },
   { "viewport.door_2.EDITOR.x",                        "566"                   },
   { "viewport.door_2.EDITOR.y",                        "356"                   },
+  { "viewport.door_2.EDITOR.width",            "100"                   },
+  { "viewport.door_2.EDITOR.height",           "144"                   },
+  { "viewport.door_2.EDITOR.border_size",      "4"                     },
 
   { NULL,                                      NULL                    }
 };