rnd-20070123-1-src

* fixed small cosmetical bug with underlining property tabs in editor

diff --git a/ChangeLog b/ChangeLog
index 1412fe15f733e57269c29c30434daedfb027c5ac..f9fee81176f88a5856e34ee0f966c2dc4077357d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-01-21
+       * fixed small cosmetical bug with underlining property tabs in editor
+
 2007-01-20
        * fixed small drawing bug in X11FadeRectangle
        * added new elements for newly supported Diamond Caves II levels:

diff --git a/src/conf_fnt.c b/src/conf_fnt.c
index 35d60b91022d085bd402345eb657b15942704dd5..4cf2aa68b2f679467343a6a1c3fccfe1646f2743 100644 (file)
--- a/src/conf_fnt.c
+++ b/src/conf_fnt.c
@@ -87,6 +87,10 @@ font_to_graphic[] =
     FONT_TEXT_1_ACTIVE,                                GFX_SPECIAL_ARG_SCORES,
     IMG_FONT_TEXT_1_ACTIVE_SCORES
   },
+  {
+    FONT_TEXT_1,                               GFX_SPECIAL_ARG_DOOR,
+    IMG_FONT_TEXT_1_DOOR
+  },
   {
     FONT_TEXT_2,                               -1,
     IMG_FONT_TEXT_2

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index a4946dc939ecff205863dbb2301c680bc735b66e..49f0f31c05c25d4af0b1137063d22a9fda901e4a 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -1495,8 +1495,8 @@ struct ConfigInfo image_config[] =
   { "em_key_4.frames",                         "1"                     },
 
   { "dc_key_white",                            "RocksSP.pcx"           },
-  { "dc_key_white.xpos",                       "7"                     },
-  { "dc_key_white.ypos",                       "5"                     },
+  { "dc_key_white.xpos",                       "13"                    },
+  { "dc_key_white.ypos",                       "1"                     },
   { "dc_key_white.frames",                     "1"                     },
 
   { "em_gate_1",                               "RocksSP.pcx"           },
@@ -1517,8 +1517,8 @@ struct ConfigInfo image_config[] =
   { "em_gate_4.frames",                                "1"                     },
 
   { "dc_gate_white",                           "RocksSP.pcx"           },
-  { "dc_gate_white.xpos",                      "6"                     },
-  { "dc_gate_white.ypos",                      "5"                     },
+  { "dc_gate_white.xpos",                      "14"                    },
+  { "dc_gate_white.ypos",                      "1"                     },
   { "dc_gate_white.frames",                    "1"                     },
 
   { "em_gate_1_gray",                          "RocksSP.pcx"           },
@@ -1571,11 +1571,11 @@ struct ConfigInfo image_config[] =
   { "dc_gate_white_gray.ypos",                 "7"                     },
   { "dc_gate_white_gray.frames",               "1"                     },
   { "dc_gate_white_gray.EDITOR",               "RocksSP.pcx"           },
-  { "dc_gate_white_gray.EDITOR.xpos",          "11"                    },
-  { "dc_gate_white_gray.EDITOR.ypos",          "11"                    },
+  { "dc_gate_white_gray.EDITOR.xpos",          "15"                    },
+  { "dc_gate_white_gray.EDITOR.ypos",          "1"                     },
   { "dc_gate_white_gray.active",               "RocksSP.pcx"           },
-  { "dc_gate_white_gray.active.xpos",          "6"                     },
-  { "dc_gate_white_gray.active.ypos",          "5"                     },
+  { "dc_gate_white_gray.active.xpos",          "14"                    },
+  { "dc_gate_white_gray.active.ypos",          "1"                     },
   { "dc_gate_white_gray.active.frames",                "1"                     },
 
   { "dc_gate_fake_gray",                       "RocksSP.pcx"           },
@@ -4579,22 +4579,22 @@ struct ConfigInfo image_config[] =
   { "menu.button_down.active.ypos",            "9"                     },
   { "menu.button_down.active.frames",          "1"                     },
 
-  { "menu.button_enter_menu",                  "RocksDC.pcx"           },
+  { "menu.button_enter_menu",                  UNDEFINED_FILENAME      },
   { "menu.button_enter_menu.clone_from",       "menu.button_right"     },
-  { "menu.button_enter_menu.active",           "RocksDC.pcx"           },
+  { "menu.button_enter_menu.active",           UNDEFINED_FILENAME      },
   { "menu.button_enter_menu.active.clone_from",        "menu.button_right.active" },
-  { "menu.button_leave_menu",                  "RocksDC.pcx"           },
+  { "menu.button_leave_menu",                  UNDEFINED_FILENAME      },
   { "menu.button_leave_menu.clone_from",       "menu.button_left"      },
-  { "menu.button_leave_menu.active",           "RocksDC.pcx"           },
+  { "menu.button_leave_menu.active",           UNDEFINED_FILENAME      },
   { "menu.button_leave_menu.active.clone_from",        "menu.button_left.active" },
 
-  { "menu.button_next_level",                  "RocksDC.pcx"           },
+  { "menu.button_next_level",                  UNDEFINED_FILENAME      },
   { "menu.button_next_level.clone_from",       "menu.button_right"     },
-  { "menu.button_next_level.active",           "RocksDC.pcx"           },
+  { "menu.button_next_level.active",           UNDEFINED_FILENAME      },
   { "menu.button_next_level.active.clone_from",        "menu.button_right.active" },
-  { "menu.button_prev_level",                  "RocksDC.pcx"           },
+  { "menu.button_prev_level",                  UNDEFINED_FILENAME      },
   { "menu.button_prev_level.clone_from",       "menu.button_left"      },
-  { "menu.button_prev_level.active",           "RocksDC.pcx"           },
+  { "menu.button_prev_level.active",           UNDEFINED_FILENAME      },
   { "menu.button_prev_level.active.clone_from",        "menu.button_left.active" },
 
   { "menu.scrollbar",                          "RocksDC.pcx"           },
@@ -4684,6 +4684,8 @@ struct ConfigInfo image_config[] =
   { "font.text_1.active.SCORES.y",             "0"                     },
   { "font.text_1.active.SCORES.width",         "16"                    },
   { "font.text_1.active.SCORES.height",                "32"                    },
+  { "font.text_1.DOOR",                                UNDEFINED_FILENAME      },
+  { "font.text_1.DOOR.clone_from",             "font.level_number"     },
   { "font.text_2",                             "RocksFontSmall.pcx"    },
   { "font.text_2.x",                           "0"                     },
   { "font.text_2.y",                           "210"                   },
@@ -5105,16 +5107,216 @@ struct ConfigInfo image_config[] =
 
   { "game.panel.level.x",                      "37"                    },
   { "game.panel.level.y",                      "20"                    },
+#if 0
+  { "game.panel.level.digits",                 "2"                     },
+#endif
   { "game.panel.gems.x",                       "29"                    },
   { "game.panel.gems.y",                       "54"                    },
+#if 0
+  { "game.panel.gems.digits",                  "3"                     },
+#endif
   { "game.panel.inventory.x",                  "29"                    },
   { "game.panel.inventory.y",                  "89"                    },
+#if 0
+  { "game.panel.inventory.digits",             "3"                     },
+#endif
   { "game.panel.keys.x",                       "18"                    },
   { "game.panel.keys.y",                       "123"                   },
   { "game.panel.score.x",                      "15"                    },
   { "game.panel.score.y",                      "159"                   },
+#if 0
+  { "game.panel.score.digits",                 "5"                     },
+#endif
   { "game.panel.time.x",                       "29"                    },
   { "game.panel.time.y",                       "194"                   },
+#if 0
+  { "game.panel.time.digits",                  "3"                     },
+#endif
+
+#if 0
+  /* --- not yet available (start) --- */
+
+  { "game.panel.time_hh.x",                    "-1"                    },
+  { "game.panel.time_hh.y",                    "-1"                    },
+  { "game.panel.time_mm.x",                    "-1"                    },
+  { "game.panel.time_mm.y",                    "-1"                    },
+  { "game.panel.time_ss.x",                    "-1"                    },
+  { "game.panel.time_ss.y",                    "-1"                    },
+
+  { "game.panel.drop_next_1.x",                        "-1"                    },
+  { "game.panel.drop_next_1.y",                        "-1"                    },
+  { "game.panel.drop_next_2.x",                        "-1"                    },
+  { "game.panel.drop_next_2.y",                        "-1"                    },
+  { "game.panel.drop_next_3.x",                        "-1"                    },
+  { "game.panel.drop_next_3.y",                        "-1"                    },
+  { "game.panel.drop_next_4.x",                        "-1"                    },
+  { "game.panel.drop_next_4.y",                        "-1"                    },
+  { "game.panel.drop_next_5.x",                        "-1"                    },
+  { "game.panel.drop_next_5.y",                        "-1"                    },
+  { "game.panel.drop_next_6.x",                        "-1"                    },
+  { "game.panel.drop_next_6.y",                        "-1"                    },
+  { "game.panel.drop_next_7.x",                        "-1"                    },
+  { "game.panel.drop_next_7.y",                        "-1"                    },
+  { "game.panel.drop_next_8.x",                        "-1"                    },
+  { "game.panel.drop_next_8.y",                        "-1"                    },
+  { "game.panel.key_1.x",                      "-1"                    },
+  { "game.panel.key_1.y",                      "-1"                    },
+  { "game.panel.key_2.x",                      "-1"                    },
+  { "game.panel.key_2.y",                      "-1"                    },
+  { "game.panel.key_3.x",                      "-1"                    },
+  { "game.panel.key_3.y",                      "-1"                    },
+  { "game.panel.key_4.x",                      "-1"                    },
+  { "game.panel.key_4.y",                      "-1"                    },
+  { "game.panel.key_5.x",                      "-1"                    },
+  { "game.panel.key_5.y",                      "-1"                    },
+  { "game.panel.key_6.x",                      "-1"                    },
+  { "game.panel.key_6.y",                      "-1"                    },
+  { "game.panel.key_7.x",                      "-1"                    },
+  { "game.panel.key_7.y",                      "-1"                    },
+  { "game.panel.key_8.x",                      "-1"                    },
+  { "game.panel.key_8.y",                      "-1"                    },
+  { "game.panel.key_white.x",                  "-1"                    },
+  { "game.panel.key_white.y",                  "-1"                    },
+  { "game.panel.num_white_keys.x",             "-1"                    },
+  { "game.panel.num_white_keys.y",             "-1"                    },
+  { "game.panel.num_white_keys.digits",                "-1"                    },
+
+  { "game.panel.shield_normal.x",              "-1"                    },
+  { "game.panel.shield_normal.y",              "-1"                    },
+  { "game.panel.shield_normal_time.x",         "-1"                    },
+  { "game.panel.shield_normal.time.y",         "-1"                    },
+  { "game.panel.shield_normal.time.digits",    "-1"                    },
+  { "game.panel.shield_deadly.x",              "-1"                    },
+  { "game.panel.shield_deadly.y",              "-1"                    },
+  { "game.panel.shield_deadly_time.x",         "-1"                    },
+  { "game.panel.shield_deadly.time.y",         "-1"                    },
+  { "game.panel.shield_deadly.time.digits",    "-1"                    },
+
+  { "game.panel.exit.x",                       "-1"                    },
+  { "game.panel.exit.y",                       "-1"                    },
+  { "game.panel.em_exit.x",                    "-1"                    },
+  { "game.panel.em_exit.y",                    "-1"                    },
+  { "game.panel.sp_exit.x",                    "-1"                    },
+  { "game.panel.sp_exit.y",                    "-1"                    },
+  { "game.panel.steel_exit.x",                 "-1"                    },
+  { "game.panel.steel_exit.y",                 "-1"                    },
+  { "game.panel.em_steel_exit.x",              "-1"                    },
+  { "game.panel.em_steel_exit.y",              "-1"                    },
+
+  { "game.panel.emc_magic_ball.x",             "-1"                    },
+  { "game.panel.emc_magic_ball.y",             "-1"                    },
+  { "game.panel.emc_magic_ball_time.x",                "-1"                    },
+  { "game.panel.emc_magic_ball_time.y",                "-1"                    },
+  { "game.panel.emc_magic_ball_time.digits",   "-1"                    },
+
+  { "game.panel.light_switch.x",               "-1"                    },
+  { "game.panel.light_switch.y",               "-1"                    },
+  { "game.panel.light_switch_time.x",          "-1"                    },
+  { "game.panel.light_switch_time.y",          "-1"                    },
+  { "game.panel.light_switch_time.digits",     "-1"                    },
+
+  { "game.panel.timegate_switch.x",            "-1"                    },
+  { "game.panel.timegate_switch.y",            "-1"                    },
+  { "game.panel.timegate_switch_time.x",       "-1"                    },
+  { "game.panel.timegate_switch_time.y",       "-1"                    },
+  { "game.panel.timegate_switch_time.digits",  "-1"                    },
+
+  { "game.panel.switchgate_switch.x",          "-1"                    },
+  { "game.panel.switchgate_switch.y",          "-1"                    },
+
+  { "game.panel.emc_lenses.x",                 "-1"                    },
+  { "game.panel.emc_lenses.y",                 "-1"                    },
+  { "game.panel.emc_lenses_time.x",            "-1"                    },
+  { "game.panel.emc_lenses_time.y",            "-1"                    },
+  { "game.panel.emc_lenses_time.digits",       "-1"                    },
+
+  { "game.panel.emc_magnifier.x",              "-1"                    },
+  { "game.panel.emc_magnifier.y",              "-1"                    },
+  { "game.panel.emc_magnifier_time.x",         "-1"                    },
+  { "game.panel.emc_magnifier_time.y",         "-1"                    },
+  { "game.panel.emc_magnifier_time.digits",    "-1"                    },
+
+  { "game.panel.balloon_switch.x",             "-1"                    },
+  { "game.panel.balloon_switch.y",             "-1"                    },
+
+  { "game.panel.dynabomb_number.x",            "-1"                    },
+  { "game.panel.dynabomb_number.y",            "-1"                    },
+  { "game.panel.dynabomb_number.digits",       "-1"                    },
+  { "game.panel.dynabomb_size.x",              "-1"                    },
+  { "game.panel.dynabomb_size.y",              "-1"                    },
+  { "game.panel.dynabomb_size.digits",         "-1"                    },
+  { "game.panel.dynabomb_power.x",             "-1"                    },
+  { "game.panel.dynabomb_power.y",             "-1"                    },
+
+  { "game.panel.penguins.x",                   "-1"                    },
+  { "game.panel.penguins.y",                   "-1"                    },
+  { "game.panel.penguins.digits",              "-1"                    },
+
+  { "game.panel.sokoban_objects.x",            "-1"                    },
+  { "game.panel.sokoban_objects.y",            "-1"                    },
+  { "game.panel.sokoban_objects.digits",       "-1"                    },
+  { "game.panel.sokoban_fields.x",             "-1"                    },
+  { "game.panel.sokoban_fields.y",             "-1"                    },
+  { "game.panel.sokoban_fields.digits",                "-1"                    },
+
+  { "game.panel.robot_wheel.x",                        "-1"                    },
+  { "game.panel.robot_wheel.y",                        "-1"                    },
+
+  { "game.panel.conveyor_belt_1.x",            "-1"                    },
+  { "game.panel.conveyor_belt_1.y",            "-1"                    },
+  { "game.panel.conveyor_belt_2.x",            "-1"                    },
+  { "game.panel.conveyor_belt_2.y",            "-1"                    },
+  { "game.panel.conveyor_belt_3.x",            "-1"                    },
+  { "game.panel.conveyor_belt_3.y",            "-1"                    },
+  { "game.panel.conveyor_belt_4.x",            "-1"                    },
+  { "game.panel.conveyor_belt_4.y",            "-1"                    },
+  { "game.panel.conveyor_belt_1_switch.x",     "-1"                    },
+  { "game.panel.conveyor_belt_1_switch.y",     "-1"                    },
+  { "game.panel.conveyor_belt_2_switch.x",     "-1"                    },
+  { "game.panel.conveyor_belt_2_switch.y",     "-1"                    },
+  { "game.panel.conveyor_belt_3_switch.x",     "-1"                    },
+  { "game.panel.conveyor_belt_3_switch.y",     "-1"                    },
+  { "game.panel.conveyor_belt_4_switch.x",     "-1"                    },
+  { "game.panel.conveyor_belt_4_switch.y",     "-1"                    },
+
+  { "game.panel.magic_wall.x",                 "-1"                    },
+  { "game.panel.magic_wall.y",                 "-1"                    },
+  { "game.panel.magic_wall_time.x",            "-1"                    },
+  { "game.panel.magic_wall_time.y",            "-1"                    },
+  { "game.panel.magic_wall_time.digits",       "-1"                    },
+  { "game.panel.bd_magic_wall.x",              "-1"                    },
+  { "game.panel.bd_magic_wall.y",              "-1"                    },
+  { "game.panel.dc_magic_wall.x",              "-1"                    },
+  { "game.panel.dc_magic_wall.y",              "-1"                    },
+
+  { "game.panel.player_name.x",                        "-1"                    },
+  { "game.panel.player_name.y",                        "-1"                    },
+
+  { "game.panel.level_name.x",                 "-1"                    },
+  { "game.panel.level_name.y",                 "-1"                    },
+  { "game.panel.level_author.x",               "-1"                    },
+  { "game.panel.level_author.y",               "-1"                    },
+
+  { "game.panel.stop.x",                       "-1"                    },
+  { "game.panel.stop.y",                       "-1"                    },
+
+  { "game.panel.pause.x",                      "-1"                    },
+  { "game.panel.pause.y",                      "-1"                    },
+
+  { "game.panel.play.x",                       "-1"                    },
+  { "game.panel.play.y",                       "-1"                    },
+
+  { "game.panel.sound_music.x",                        "-1"                    },
+  { "game.panel.sound_music.y",                        "-1"                    },
+
+  { "game.panel.sound_loops.x",                        "-1"                    },
+  { "game.panel.sound_loops.y",                        "-1"                    },
+
+  { "game.panel.sound_simple.x",               "-1"                    },
+  { "game.panel.sound_simple.y",               "-1"                    },
+
+  /* --- not yet available (end) --- */
+#endif
 
   { "[player].boring_delay_fixed",             "1000"                  },
   { "[player].boring_delay_random",            "1000"                  },

diff --git a/src/conf_gfx.h b/src/conf_gfx.h
index 0f47add427fb37636a54d98aacb30dec3f1af304..e68db86c6faf508ae065cecea309e87d6506e504 100644 (file)
--- a/src/conf_gfx.h
+++ b/src/conf_gfx.h
@@ -1683,75 +1683,76 @@
 #define IMG_FONT_TEXT_1_PREVIEW                                1662
 #define IMG_FONT_TEXT_1_SCORES                         1663
 #define IMG_FONT_TEXT_1_ACTIVE_SCORES                  1664
-#define IMG_FONT_TEXT_2                                        1665
-#define IMG_FONT_TEXT_2_LEVELS                         1666
-#define IMG_FONT_TEXT_2_PREVIEW                                1667
-#define IMG_FONT_TEXT_2_SCORES                         1668
-#define IMG_FONT_TEXT_2_ACTIVE_SCORES                  1669
-#define IMG_FONT_TEXT_3                                        1670
-#define IMG_FONT_TEXT_3_LEVELS                         1671
-#define IMG_FONT_TEXT_3_PREVIEW                                1672
-#define IMG_FONT_TEXT_3_SCORES                         1673
-#define IMG_FONT_TEXT_3_ACTIVE_SCORES                  1674
-#define IMG_FONT_TEXT_4                                        1675
-#define IMG_FONT_TEXT_4_LEVELS                         1676
-#define IMG_FONT_TEXT_4_SCORES                         1677
-#define IMG_FONT_TEXT_4_ACTIVE_SCORES                  1678
-#define IMG_FONT_ENVELOPE_1                            1679
-#define IMG_FONT_ENVELOPE_2                            1680
-#define IMG_FONT_ENVELOPE_3                            1681
-#define IMG_FONT_ENVELOPE_4                            1682
-#define IMG_FONT_INPUT_1                               1683
-#define IMG_FONT_INPUT_1_MAIN                          1684
-#define IMG_FONT_INPUT_1_ACTIVE                                1685
-#define IMG_FONT_INPUT_1_ACTIVE_MAIN                   1686
-#define IMG_FONT_INPUT_1_ACTIVE_SETUP                  1687
-#define IMG_FONT_INPUT_2                               1688
-#define IMG_FONT_INPUT_2_ACTIVE                                1689
-#define IMG_FONT_OPTION_OFF                            1690
-#define IMG_FONT_OPTION_ON                             1691
-#define IMG_FONT_VALUE_1                               1692
-#define IMG_FONT_VALUE_2                               1693
-#define IMG_FONT_VALUE_OLD                             1694
-#define IMG_FONT_LEVEL_NUMBER                          1695
-#define IMG_FONT_TAPE_RECORDER                         1696
-#define IMG_FONT_GAME_INFO                             1697
-#define IMG_GLOBAL_BORDER                              1698
-#define IMG_GLOBAL_DOOR                                        1699
-#define IMG_EDITOR_ELEMENT_BORDER                      1700
-#define IMG_EDITOR_ELEMENT_BORDER_INPUT                        1701
-#define IMG_EDITOR_CASCADE_LIST                                1702
-#define IMG_EDITOR_CASCADE_LIST_ACTIVE                 1703
-#define IMG_BACKGROUND_ENVELOPE_1                      1704
-#define IMG_BACKGROUND_ENVELOPE_2                      1705
-#define IMG_BACKGROUND_ENVELOPE_3                      1706
-#define IMG_BACKGROUND_ENVELOPE_4                      1707
-#define IMG_BACKGROUND                                 1708
-#define IMG_BACKGROUND_TITLE                           1709
-#define IMG_BACKGROUND_MESSAGE                         1710
-#define IMG_BACKGROUND_MAIN                            1711
-#define IMG_BACKGROUND_LEVELS                          1712
-#define IMG_BACKGROUND_SCORES                          1713
-#define IMG_BACKGROUND_EDITOR                          1714
-#define IMG_BACKGROUND_INFO                            1715
-#define IMG_BACKGROUND_INFO_ELEMENTS                   1716
-#define IMG_BACKGROUND_INFO_MUSIC                      1717
-#define IMG_BACKGROUND_INFO_CREDITS                    1718
-#define IMG_BACKGROUND_INFO_PROGRAM                    1719
-#define IMG_BACKGROUND_INFO_LEVELSET                   1720
-#define IMG_BACKGROUND_SETUP                           1721
-#define IMG_BACKGROUND_DOOR                            1722
-#define IMG_TITLESCREEN_INITIAL_1                      1723
-#define IMG_TITLESCREEN_INITIAL_2                      1724
-#define IMG_TITLESCREEN_INITIAL_3                      1725
-#define IMG_TITLESCREEN_INITIAL_4                      1726
-#define IMG_TITLESCREEN_INITIAL_5                      1727
-#define IMG_TITLESCREEN_1                              1728
-#define IMG_TITLESCREEN_2                              1729
-#define IMG_TITLESCREEN_3                              1730
-#define IMG_TITLESCREEN_4                              1731
-#define IMG_TITLESCREEN_5                              1732
+#define IMG_FONT_TEXT_1_DOOR                           1665
+#define IMG_FONT_TEXT_2                                        1666
+#define IMG_FONT_TEXT_2_LEVELS                         1667
+#define IMG_FONT_TEXT_2_PREVIEW                                1668
+#define IMG_FONT_TEXT_2_SCORES                         1669
+#define IMG_FONT_TEXT_2_ACTIVE_SCORES                  1670
+#define IMG_FONT_TEXT_3                                        1671
+#define IMG_FONT_TEXT_3_LEVELS                         1672
+#define IMG_FONT_TEXT_3_PREVIEW                                1673
+#define IMG_FONT_TEXT_3_SCORES                         1674
+#define IMG_FONT_TEXT_3_ACTIVE_SCORES                  1675
+#define IMG_FONT_TEXT_4                                        1676
+#define IMG_FONT_TEXT_4_LEVELS                         1677
+#define IMG_FONT_TEXT_4_SCORES                         1678
+#define IMG_FONT_TEXT_4_ACTIVE_SCORES                  1679
+#define IMG_FONT_ENVELOPE_1                            1680
+#define IMG_FONT_ENVELOPE_2                            1681
+#define IMG_FONT_ENVELOPE_3                            1682
+#define IMG_FONT_ENVELOPE_4                            1683
+#define IMG_FONT_INPUT_1                               1684
+#define IMG_FONT_INPUT_1_MAIN                          1685
+#define IMG_FONT_INPUT_1_ACTIVE                                1686
+#define IMG_FONT_INPUT_1_ACTIVE_MAIN                   1687
+#define IMG_FONT_INPUT_1_ACTIVE_SETUP                  1688
+#define IMG_FONT_INPUT_2                               1689
+#define IMG_FONT_INPUT_2_ACTIVE                                1690
+#define IMG_FONT_OPTION_OFF                            1691
+#define IMG_FONT_OPTION_ON                             1692
+#define IMG_FONT_VALUE_1                               1693
+#define IMG_FONT_VALUE_2                               1694
+#define IMG_FONT_VALUE_OLD                             1695
+#define IMG_FONT_LEVEL_NUMBER                          1696
+#define IMG_FONT_TAPE_RECORDER                         1697
+#define IMG_FONT_GAME_INFO                             1698
+#define IMG_GLOBAL_BORDER                              1699
+#define IMG_GLOBAL_DOOR                                        1700
+#define IMG_EDITOR_ELEMENT_BORDER                      1701
+#define IMG_EDITOR_ELEMENT_BORDER_INPUT                        1702
+#define IMG_EDITOR_CASCADE_LIST                                1703
+#define IMG_EDITOR_CASCADE_LIST_ACTIVE                 1704
+#define IMG_BACKGROUND_ENVELOPE_1                      1705
+#define IMG_BACKGROUND_ENVELOPE_2                      1706
+#define IMG_BACKGROUND_ENVELOPE_3                      1707
+#define IMG_BACKGROUND_ENVELOPE_4                      1708
+#define IMG_BACKGROUND                                 1709
+#define IMG_BACKGROUND_TITLE                           1710
+#define IMG_BACKGROUND_MESSAGE                         1711
+#define IMG_BACKGROUND_MAIN                            1712
+#define IMG_BACKGROUND_LEVELS                          1713
+#define IMG_BACKGROUND_SCORES                          1714
+#define IMG_BACKGROUND_EDITOR                          1715
+#define IMG_BACKGROUND_INFO                            1716
+#define IMG_BACKGROUND_INFO_ELEMENTS                   1717
+#define IMG_BACKGROUND_INFO_MUSIC                      1718
+#define IMG_BACKGROUND_INFO_CREDITS                    1719
+#define IMG_BACKGROUND_INFO_PROGRAM                    1720
+#define IMG_BACKGROUND_INFO_LEVELSET                   1721
+#define IMG_BACKGROUND_SETUP                           1722
+#define IMG_BACKGROUND_DOOR                            1723
+#define IMG_TITLESCREEN_INITIAL_1                      1724
+#define IMG_TITLESCREEN_INITIAL_2                      1725
+#define IMG_TITLESCREEN_INITIAL_3                      1726
+#define IMG_TITLESCREEN_INITIAL_4                      1727
+#define IMG_TITLESCREEN_INITIAL_5                      1728
+#define IMG_TITLESCREEN_1                              1729
+#define IMG_TITLESCREEN_2                              1730
+#define IMG_TITLESCREEN_3                              1731
+#define IMG_TITLESCREEN_4                              1732
+#define IMG_TITLESCREEN_5                              1733
 
-#define NUM_IMAGE_FILES                                        1733
+#define NUM_IMAGE_FILES                                        1734
 
 #endif /* CONF_GFX_H */

diff --git a/src/conftime.h b/src/conftime.h
index ce246528e6c366a198620e29f09e6e0c8f02ae01..c2aeb9984e128bafa65221c32d9c62b67cfe904f 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2007-01-21 02:52]"
+#define COMPILE_DATE_STRING "[2007-01-23 21:36]"

diff --git a/src/editor.c b/src/editor.c
index 0f09e1b827ad852011598fb3802a84aff78b96d4..72ceb0d34704ed9393e2609bb51cd73e31c1a0b3 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -7521,17 +7521,21 @@ static int PrintElementDescriptionFromFile(char *filename, int start_line)
 
 static void DrawPropertiesTabulatorGadgets()
 {
-  struct GadgetInfo *gd_gi = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
-  struct GadgetDesign *gd = &gd_gi->alt_design[GD_BUTTON_UNPRESSED];
-  int gd_x = gd->x + gd_gi->border.width / 2;
-  int gd_y = gd->y + gd_gi->height - 1;
+  struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
+  struct GadgetInfo *gd_gi4 = level_editor_gadget[GADGET_ID_PROPERTIES_CHANGE];
+  struct GadgetDesign *gd = &gd_gi1->alt_design[GD_BUTTON_UNPRESSED];
+  int gd_x = gd->x + gd_gi1->border.width / 2;
+  int gd_y = gd->y + gd_gi1->height - 1;
   Pixel tab_color = GetPixel(gd->bitmap, gd_x, gd_y);
   int id_first = ED_TEXTBUTTON_ID_PROPERTIES_INFO;
   int id_last  = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG;
+#if 1
+#else
   int max_tabs = 4;
+#endif
   int i;
 
-  /* draw additional "advanced" tabulator for custom elements */
+  /* draw additional "change" tabulator for custom elements */
   if (IS_CUSTOM_ELEMENT(properties_element))
     id_last = ED_TEXTBUTTON_ID_PROPERTIES_CHANGE;
 
@@ -7547,21 +7551,29 @@ static void DrawPropertiesTabulatorGadgets()
       continue;
 
     /* draw background line below tabulator button */
-    ClearRectangleOnBackground(drawto, gi->x, gi->y + gi->height, gi->width,1);
+    ClearRectangleOnBackground(drawto, gi->x, gi->y + gi->height, gi->width, 1);
 
     /* draw solid line below inactive tabulator buttons */
     if (!active && tab_color != BLACK_PIXEL)   /* black => transparent */
-      FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width,1, tab_color);
+      FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width, 1, tab_color);
 
     ModifyGadget(gi, GDI_ACTIVE, active, GDI_END);
     MapTextbuttonGadget(i);
   }
 
+#if 1
   /* draw little border line below tabulator buttons */
   if (tab_color != BLACK_PIXEL)                        /* black => transparent */
-    FillRectangle(drawto, gd_gi->x, gd_gi->y + gd_gi->height + 1,
-                 max_tabs * gd_gi->width + (max_tabs -1) * ED_GADGET_DISTANCE,
+    FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height + 1,
+                 gd_gi4->x - gd_gi1->x + gd_gi4->width, ED_GADGET_DISTANCE,
+                 tab_color);
+#else
+  /* draw little border line below tabulator buttons */
+  if (tab_color != BLACK_PIXEL)                        /* black => transparent */
+    FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height + 1,
+                 max_tabs * gd_gi1->width + (max_tabs -1) * ED_GADGET_DISTANCE,
                  ED_GADGET_DISTANCE, tab_color);
+#endif
 }
 
 static void DrawPropertiesInfo()

diff --git a/src/files.c b/src/files.c
index 3d900932701c7db7a6070b859baba87e91149ebf..3b445b96f1180558a178e8132c19451a878ba39b 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -4157,19 +4157,19 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x0f4f:       /* dynamite (lit 1) */
-      element = EL_DYNAMITE_ACTIVE;
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
     case 0x0f57:       /* dynamite (lit 2) */
-      element = EL_DYNAMITE_ACTIVE;
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
     case 0x0f5f:       /* dynamite (lit 3) */
-      element = EL_DYNAMITE_ACTIVE;
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
     case 0x0f67:       /* dynamite (lit 4) */
-      element = EL_DYNAMITE_ACTIVE;
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
     case 0x0f81:
@@ -4332,7 +4332,7 @@ int getMappedElement_DC(int element)
       break;
 
     case 0x14e9:
-      element = EL_SHIELD_NORMAL;
+      element = EL_SHIELD_DEADLY;
       break;
 
     case 0x1501:
@@ -4362,7 +4362,7 @@ int getMappedElement_DC(int element)
       /* EL_DC_LANDMINE */
 
     case 0x15a0:
-      element = EL_DYNAMITE;
+      element = EL_EM_DYNAMITE;
       break;
 
     case 0x15a1:       /* key (red) */

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index f9b8b2570134b840e1cd41f418e5a207c12cedc9..f01ce132a3155b7e7349e110415ceb26145855f5 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -1965,6 +1965,10 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
 
       file_list[list_pos].token = config_list[i].token;
       file_list[list_pos].default_filename = config_list[i].value;
+
+#if 0
+      printf("::: '%s' => '%s'\n", config_list[i].token, config_list[i].value);
+#endif
     }
   }
 
@@ -1973,13 +1977,17 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
   {
     Error(ERR_RETURN_LINE, "-");
     Error(ERR_RETURN, "inconsistant config list information:");
-    Error(ERR_RETURN, "- should be:   %d (according to 'src/conf_gfx.h')",
+    Error(ERR_RETURN, "- should be:   %d (according to 'src/conf_xxx.h')",
          num_file_list_entries);
-    Error(ERR_RETURN, "- found to be: %d (according to 'src/conf_gfx.c')",
+    Error(ERR_RETURN, "- found to be: %d (according to 'src/conf_xxx.c')",
          num_file_list_entries_found);
     Error(ERR_EXIT,   "please fix");
   }
 
+#if 0
+  printf("::: ---------- DONE ----------\n");
+#endif
+
   return file_list;
 }
 

diff --git a/src/tools.c b/src/tools.c
index 3d9416e35acf0bfe6481d3b4562f67a6e5b37308..d68819823f2fdeb5db4eceb610aa22db4f848226 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -2523,7 +2523,11 @@ boolean Request(char *text, unsigned int req_state)
     if (max_word_len > MAX_REQUEST_LINE_FONT1_LEN)
     {
       max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN;
+#if 1
+      font_nr = FONT_TEXT_1;
+#else
       font_nr = FONT_LEVEL_NUMBER;
+#endif
 
       break;
     }