projects / rocksndiamonds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
reused unused font definition for text on joystick configuration page
[rocksndiamonds.git] / src / conf_gfx.c
diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 6cdb6fe06c8b39e49df0b25b632ee5dbf9fa3e96..ea1630257a714d688ccd95b633bd3c25ca2b8a40 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -4392,7 +4392,7 @@ struct ConfigInfo image_config[] =
   { "mm_exit.opening.xpos",                    "8"                     },
   { "mm_exit.opening.ypos",                    "1"                     },
   { "mm_exit.opening.frames",                  "4"                     },
-  { "mm_exit.opening.delay",                   "8"                     },
+  { "mm_exit.opening.delay",                   "6"                     },
   { "mm_exit.opening.anim_mode",               "linear"                },
   { "mm_exit_open",                            "RocksMM.png"           },
   { "mm_exit_open.xpos",                       "11"                    },
@@ -4402,7 +4402,7 @@ struct ConfigInfo image_config[] =
   { "mm_exit.closing.xpos",                    "8"                     },
   { "mm_exit.closing.ypos",                    "1"                     },
   { "mm_exit.closing.frames",                  "4"                     },
-  { "mm_exit.closing.delay",                   "8"                     },
+  { "mm_exit.closing.delay",                   "6"                     },
   { "mm_exit.closing.anim_mode",               "linear,reverse"        },
 
   { "mm_mirror_1",                             "RocksMM.png"           },
@@ -4931,7 +4931,7 @@ struct ConfigInfo image_config[] =
   { "mm_kettle",                               "RocksMM.png"           },
   { "mm_kettle.xpos",                          "12"                    },
   { "mm_kettle.ypos",                          "1"                     },
-  { "mm_kettle.frames",                                "4"                     },
+  { "mm_kettle.frames",                                "1"                     },
   { "mm_kettle.exploding",                     "RocksMM.png"           },
   { "mm_kettle.exploding.xpos",                        "13"                    },
   { "mm_kettle.exploding.ypos",                        "1"                     },
@@ -6088,6 +6088,32 @@ struct ConfigInfo image_config[] =
   { "menu.scrollbar.active.ypos",              "10"                    },
   { "menu.scrollbar.active.frames",            "1"                     },
 
+  { "gfx.game.panel.time_anim",                        "RocksDoorMM.png"       },
+  { "gfx.game.panel.time_anim.x",              "5"                     },
+  { "gfx.game.panel.time_anim.y",              "0"                     },
+  { "gfx.game.panel.time_anim.width",          "90"                    },
+  { "gfx.game.panel.time_anim.height",         "35"                    },
+  { "gfx.game.panel.time_anim.frames",         "1"                     },
+  { "gfx.game.panel.time_anim.active",         "RocksDoorMM.png"       },
+  { "gfx.game.panel.time_anim.active.x",       "105"                   },
+  { "gfx.game.panel.time_anim.active.y",       "0"                     },
+  { "gfx.game.panel.time_anim.active.width",   "90"                    },
+  { "gfx.game.panel.time_anim.active.height",  "35"                    },
+  { "gfx.game.panel.time_anim.active.frames",  "1"                     },
+
+  { "gfx.game.panel.health_anim",              "RocksDoorMM.png"       },
+  { "gfx.game.panel.health_anim.x",            "5"                     },
+  { "gfx.game.panel.health_anim.y",            "35"                    },
+  { "gfx.game.panel.health_anim.width",                "90"                    },
+  { "gfx.game.panel.health_anim.height",       "35"                    },
+  { "gfx.game.panel.health_anim.frames",       "1"                     },
+  { "gfx.game.panel.health_anim.active",       "RocksDoorMM.png"       },
+  { "gfx.game.panel.health_anim.active.x",     "105"                   },
+  { "gfx.game.panel.health_anim.active.y",     "35"                    },
+  { "gfx.game.panel.health_anim.active.width", "90"                    },
+  { "gfx.game.panel.health_anim.active.height",        "35"                    },
+  { "gfx.game.panel.health_anim.active.frames",        "1"                     },
+
   { "gfx.game.button.stop",                    "RocksDoor.png"         },
   { "gfx.game.button.stop.x",                  "305"                   },
   { "gfx.game.button.stop.y",                  "185"                   },
@@ -6355,7 +6381,7 @@ struct ConfigInfo image_config[] =
   { "font.title_2.width",                      "14"                    },
   { "font.title_2.height",                     "14"                    },
   { "font.title_2.SETUP",                      UNDEFINED_FILENAME      },
-  { "font.title_2.SETUP.clone_from",           "font.text_4"           },
+  { "font.title_2.SETUP.clone_from",           "font.text_2"           },
 
   { "font.menu_1",                             "RocksFontBig.png"      },
   { "font.menu_1.x",                           "0"                     },
@@ -7679,6 +7705,8 @@ struct ConfigInfo image_config[] =
   { "menu.draw_yoffset.EDITOR",                        "0"                     },
   { "menu.draw_xoffset.INFO",                  "0"                     },
   { "menu.draw_yoffset.INFO",                  "0"                     },
+  { "menu.draw_xoffset.INFO[TITLE]",           "0"                     },
+  { "menu.draw_yoffset.INFO[TITLE]",           "0"                     },
   { "menu.draw_xoffset.INFO[ELEMENTS]",                "0"                     },
   { "menu.draw_yoffset.INFO[ELEMENTS]",                "0"                     },
   { "menu.draw_xoffset.INFO[MUSIC]",           "0"                     },
@@ -7734,6 +7762,56 @@ struct ConfigInfo image_config[] =
   { "menu.list_size.INFO[ELEMENTS]",           "-1"                    },
   { "menu.list_size.SETUP",                    "-1"                    },
 
+  { "menu.paragraph_spacing.INFO",             "-3"                    },
+  { "menu.paragraph_spacing.INFO[TITLE]",      "-3"                    },
+  { "menu.paragraph_spacing.INFO[ELEMENTS]",   "-3"                    },
+  { "menu.paragraph_spacing.INFO[MUSIC]",      "-3"                    },
+  { "menu.paragraph_spacing.INFO[CREDITS]",    "-3"                    },
+  { "menu.paragraph_spacing.INFO[PROGRAM]",    "-3"                    },
+  { "menu.paragraph_spacing.INFO[VERSION]",    "-3"                    },
+  { "menu.paragraph_spacing.INFO[LEVELSET]",   "-3"                    },
+  { "menu.paragraph_spacing.SETUP[INPUT]",     "-1"                    },
+
+  { "menu.headline1_spacing.INFO",             "-2"                    },
+  { "menu.headline1_spacing.INFO[TITLE]",      "-2"                    },
+  { "menu.headline1_spacing.INFO[ELEMENTS]",   "-2"                    },
+  { "menu.headline1_spacing.INFO[MUSIC]",      "-2"                    },
+  { "menu.headline1_spacing.INFO[CREDITS]",    "-2"                    },
+  { "menu.headline1_spacing.INFO[PROGRAM]",    "-2"                    },
+  { "menu.headline1_spacing.INFO[VERSION]",    "-2"                    },
+  { "menu.headline1_spacing.INFO[LEVELSET]",   "-2"                    },
+  { "menu.headline1_spacing.SETUP[INPUT]",     "-2"                    },
+
+  { "menu.headline2_spacing.INFO",             "-1"                    },
+  { "menu.headline2_spacing.INFO[TITLE]",      "-1"                    },
+  { "menu.headline2_spacing.INFO[ELEMENTS]",   "-1"                    },
+  { "menu.headline2_spacing.INFO[MUSIC]",      "-1"                    },
+  { "menu.headline2_spacing.INFO[CREDITS]",    "-1"                    },
+  { "menu.headline2_spacing.INFO[PROGRAM]",    "-1"                    },
+  { "menu.headline2_spacing.INFO[VERSION]",    "-1"                    },
+  { "menu.headline2_spacing.INFO[LEVELSET]",   "-1"                    },
+  { "menu.headline2_spacing.SETUP[INPUT]",     "-1"                    },
+
+  { "menu.line_spacing.INFO",                  "0"                     },
+  { "menu.line_spacing.INFO[TITLE]",           "0"                     },
+  { "menu.line_spacing.INFO[ELEMENTS]",                "0"                     },
+  { "menu.line_spacing.INFO[MUSIC]",           "0"                     },
+  { "menu.line_spacing.INFO[CREDITS]",         "0"                     },
+  { "menu.line_spacing.INFO[PROGRAM]",         "0"                     },
+  { "menu.line_spacing.INFO[VERSION]",         "0"                     },
+  { "menu.line_spacing.INFO[LEVELSET]",                "0"                     },
+  { "menu.line_spacing.SETUP[INPUT]",          "0"                     },
+
+  { "menu.extra_spacing.INFO",                 "2"                     },
+  { "menu.extra_spacing.INFO[TITLE]",          "2"                     },
+  { "menu.extra_spacing.INFO[ELEMENTS]",       "2"                     },
+  { "menu.extra_spacing.INFO[MUSIC]",          "2"                     },
+  { "menu.extra_spacing.INFO[CREDITS]",                "2"                     },
+  { "menu.extra_spacing.INFO[PROGRAM]",                "2"                     },
+  { "menu.extra_spacing.INFO[VERSION]",                "2"                     },
+  { "menu.extra_spacing.INFO[LEVELSET]",       "2"                     },
+  { "menu.extra_spacing.SETUP[INPUT]",         "2"                     },
+
   { "main.button.name.x",                      "0"                     },
   { "main.button.name.y",                      "64"                    },
   { "main.button.levels.x",                    "0"                     },
@@ -8328,6 +8406,27 @@ struct ConfigInfo image_config[] =
   { "game.panel.time_ss.draw_masked",          "true"                  },
   { "game.panel.time_ss.draw_order",           "0"                     },
 
+  { "game.panel.time_anim.x",                  "5"                     },
+  { "game.panel.time_anim.y",                  "72"                    },
+  { "game.panel.time_anim.direction",          "right"                 },
+  { "game.panel.time_anim.class",              "mm_engine_only"        },
+
+  { "game.panel.health.x",                     "-1"                    },
+  { "game.panel.health.y",                     "-1"                    },
+  { "game.panel.health.align",                 "center"                },
+  { "game.panel.health.valign",                        "top"                   },
+  { "game.panel.health.digits",                        "-1"                    },
+  { "game.panel.health.font",                  "font.text_2"           },
+  { "game.panel.health.font_narrow",           "font.text_1"           },
+  { "game.panel.health.draw_masked",           "true"                  },
+  { "game.panel.health.draw_order",            "0"                     },
+
+  { "game.panel.health_anim.x",                        "5"                     },
+  { "game.panel.health_anim.y",                        "107"                   },
+  { "game.panel.health_anim.direction",                "right"                 },
+  { "game.panel.health_anim.class",            "mm_engine_only"        },
+  { "game.panel.health_anim.style",            "reverse"               },
+
   { "game.panel.frame.x",                      "-1"                    },
   { "game.panel.frame.y",                      "-1"                    },
   { "game.panel.frame.align",                  "left"                  },
Rocks'n'Diamonds