rnd-20140212-1-src

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 76333abd86686dcff61b65488a57ed53df895487..e8cc66ede8cf5052413e88b55b0d1b20fee1e365 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -4859,8 +4859,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"                   },
@@ -5091,6 +5095,12 @@ struct ConfigInfo image_config[] =
   { "font.envelope_4.width",                   "16"                    },
   { "font.envelope_4.height",                  "16"                    },
 
+  { "font.request",                            "RocksFontSmall.png"    },
+  { "font.request.x",                          "0"                     },
+  { "font.request.y",                          "210"                   },
+  { "font.request.width",                      "14"                    },
+  { "font.request.height",                     "14"                    },
+
   { "font.input_1",                            "RocksFontSmall.png"    },
   { "font.input_1.x",                          "0"                     },
   { "font.input_1.y",                          "210"                   },
@@ -5306,6 +5316,16 @@ struct ConfigInfo image_config[] =
   { "titlescreen_4",                           UNDEFINED_FILENAME      },
   { "titlescreen_5",                           UNDEFINED_FILENAME      },
 
+  { "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      },
+
   /* the following directives are not associated with an image, but
      probably make sense to be defined in "graphicsinfo.conf", too */
 
@@ -5847,14 +5867,10 @@ struct ConfigInfo image_config[] =
   { "preview.step_delay",                      "50"                    },
   { "preview.anim_mode",                       "default"               },
 
-  { "door_1.width",                            "-1"                    },
-  { "door_1.height",                           "-1"                    },
   { "door_1.step_offset",                      "2"                     },
   { "door_1.step_delay",                       "10"                    },
   { "door_1.anim_mode",                                "default"               },
 
-  { "door_2.width",                            "-1"                    },
-  { "door_2.height",                           "-1"                    },
   { "door_2.step_offset",                      "2"                     },
   { "door_2.step_delay",                       "10"                    },
   { "door_2.anim_mode",                                "default"               },
@@ -6685,8 +6701,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"                    },
@@ -6725,6 +6741,19 @@ struct ConfigInfo image_config[] =
   { "request.button.player_4.draw_player",     "true"                  },
   { "request.button.player_4.tile_size",       "16"                    },
 
+  { "request.x",                               "-1"                    },
+  { "request.y",                               "-1"                    },
+  { "request.width",                           "120"                   },
+  { "request.height",                          "300"                   },
+  { "request.border_size",                     "10"                    },
+  { "request.line_spacing",                    "2"                     },
+  { "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"                 },
 
   { "game.forced_scroll_delay_value",          "-1"                    },
@@ -6762,20 +6791,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                    }
 };