rnd-20030422-1-src
authorHolger Schemel <info@artsoft.org>
Mon, 21 Apr 2003 23:56:02 +0000 (01:56 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:41:25 +0000 (10:41 +0200)
14 files changed:
CHANGES
src/conf_e2g.c
src/conf_e2s.c
src/conf_esg.c
src/conf_gfx.c
src/conf_gfx.h
src/conftime.h
src/editor.c
src/game.c
src/init.c
src/main.c
src/main.h
src/screens.c
src/tools.c

diff --git a/CHANGES b/CHANGES
index 3692cfdc1d40fc7e37a4734b75d58823dcd7e7b8..0d9b2eee0fe0a2be2f5edbb61263b403a60eee87 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,17 @@
-Pre-Release Version 2.2.0rc4 [?? ??? ????]
+Pre-Release Version 2.2.0rc6 [?? ??? ????]
+------------------------------------------
+
+Pre-Release Version 2.2.0rc5 [20 APR 2003]
 ------------------------------------------
        - added generic selectbox gadget
        - added special mouse cursor for playfield while playing
        - font handling now more flexible (support for ISO-Latin-1 fonts)
 
+Pre-Release Version 2.2.0rc4 [30 MAR 2003]
+------------------------------------------
+       - changes for menu configuration
+       - not officially announced pre-release version
+
 Pre-Release Version 2.2.0rc3 [11 FEB 2003]
 ------------------------------------------
        - first custom element properties
index 0a9057c059947aab0e6f7c41f7656cfbbb39541a..10c6e1d6b36835541867be46bf0a131ebe43e4c7 100644 (file)
@@ -857,68 +857,36 @@ element_to_graphic[] =
     IMG_EM_KEY_4
   },
   {
-    EL_EM_GATE_1_CLOSED,                       -1, -1,
-    IMG_EM_GATE_1_CLOSED
+    EL_EM_GATE_1,                              -1, -1,
+    IMG_EM_GATE_1
   },
   {
-    EL_EM_GATE_1_OPEN,                         -1, -1,
-    IMG_EM_GATE_1_OPEN
+    EL_EM_GATE_2,                              -1, -1,
+    IMG_EM_GATE_2
   },
   {
-    EL_EM_GATE_2_CLOSED,                       -1, -1,
-    IMG_EM_GATE_2_CLOSED
+    EL_EM_GATE_3,                              -1, -1,
+    IMG_EM_GATE_3
   },
   {
-    EL_EM_GATE_2_OPEN,                         -1, -1,
-    IMG_EM_GATE_2_OPEN
+    EL_EM_GATE_4,                              -1, -1,
+    IMG_EM_GATE_4
   },
   {
-    EL_EM_GATE_3_CLOSED,                       -1, -1,
-    IMG_EM_GATE_3_CLOSED
+    EL_EM_GATE_1_GRAY,                         -1, -1,
+    IMG_EM_GATE_1_GRAY
   },
   {
-    EL_EM_GATE_3_OPEN,                         -1, -1,
-    IMG_EM_GATE_3_OPEN
+    EL_EM_GATE_2_GRAY,                         -1, -1,
+    IMG_EM_GATE_2_GRAY
   },
   {
-    EL_EM_GATE_4_CLOSED,                       -1, -1,
-    IMG_EM_GATE_4_CLOSED
+    EL_EM_GATE_3_GRAY,                         -1, -1,
+    IMG_EM_GATE_3_GRAY
   },
   {
-    EL_EM_GATE_4_OPEN,                         -1, -1,
-    IMG_EM_GATE_4_OPEN
-  },
-  {
-    EL_EM_GATE_1_GRAY_CLOSED,                  -1, -1,
-    IMG_EM_GATE_1_GRAY_CLOSED
-  },
-  {
-    EL_EM_GATE_1_GRAY_OPEN,                    -1, -1,
-    IMG_EM_GATE_1_GRAY_OPEN
-  },
-  {
-    EL_EM_GATE_2_GRAY_CLOSED,                  -1, -1,
-    IMG_EM_GATE_2_GRAY_CLOSED
-  },
-  {
-    EL_EM_GATE_2_GRAY_OPEN,                    -1, -1,
-    IMG_EM_GATE_2_GRAY_OPEN
-  },
-  {
-    EL_EM_GATE_3_GRAY_CLOSED,                  -1, -1,
-    IMG_EM_GATE_3_GRAY_CLOSED
-  },
-  {
-    EL_EM_GATE_3_GRAY_OPEN,                    -1, -1,
-    IMG_EM_GATE_3_GRAY_OPEN
-  },
-  {
-    EL_EM_GATE_4_GRAY_CLOSED,                  -1, -1,
-    IMG_EM_GATE_4_GRAY_CLOSED
-  },
-  {
-    EL_EM_GATE_4_GRAY_OPEN,                    -1, -1,
-    IMG_EM_GATE_4_GRAY_OPEN
+    EL_EM_GATE_4_GRAY,                         -1, -1,
+    IMG_EM_GATE_4_GRAY
   },
   {
     EL_EXIT_CLOSED,                            -1, -1,
@@ -1457,68 +1425,36 @@ element_to_graphic[] =
     IMG_KEY_4
   },
   {
-    EL_GATE_1_CLOSED,                          -1, -1,
-    IMG_GATE_1_CLOSED
-  },
-  {
-    EL_GATE_1_OPEN,                            -1, -1,
-    IMG_GATE_1_OPEN
-  },
-  {
-    EL_GATE_2_CLOSED,                          -1, -1,
-    IMG_GATE_2_CLOSED
-  },
-  {
-    EL_GATE_2_OPEN,                            -1, -1,
-    IMG_GATE_2_OPEN
-  },
-  {
-    EL_GATE_3_CLOSED,                          -1, -1,
-    IMG_GATE_3_CLOSED
-  },
-  {
-    EL_GATE_3_OPEN,                            -1, -1,
-    IMG_GATE_3_OPEN
-  },
-  {
-    EL_GATE_4_CLOSED,                          -1, -1,
-    IMG_GATE_4_CLOSED
-  },
-  {
-    EL_GATE_4_OPEN,                            -1, -1,
-    IMG_GATE_4_OPEN
-  },
-  {
-    EL_GATE_1_GRAY_CLOSED,                     -1, -1,
-    IMG_GATE_1_GRAY_CLOSED
+    EL_GATE_1,                                 -1, -1,
+    IMG_GATE_1
   },
   {
-    EL_GATE_1_GRAY_OPEN,                       -1, -1,
-    IMG_GATE_1_GRAY_OPEN
+    EL_GATE_2,                                 -1, -1,
+    IMG_GATE_2
   },
   {
-    EL_GATE_2_GRAY_CLOSED,                     -1, -1,
-    IMG_GATE_2_GRAY_CLOSED
+    EL_GATE_3,                                 -1, -1,
+    IMG_GATE_3
   },
   {
-    EL_GATE_2_GRAY_OPEN,                       -1, -1,
-    IMG_GATE_2_GRAY_OPEN
+    EL_GATE_4,                                 -1, -1,
+    IMG_GATE_4
   },
   {
-    EL_GATE_3_GRAY_CLOSED,                     -1, -1,
-    IMG_GATE_3_GRAY_CLOSED
+    EL_GATE_1_GRAY,                            -1, -1,
+    IMG_GATE_1_GRAY
   },
   {
-    EL_GATE_3_GRAY_OPEN,                       -1, -1,
-    IMG_GATE_3_GRAY_OPEN
+    EL_GATE_2_GRAY,                            -1, -1,
+    IMG_GATE_2_GRAY
   },
   {
-    EL_GATE_4_GRAY_CLOSED,                     -1, -1,
-    IMG_GATE_4_GRAY_CLOSED
+    EL_GATE_3_GRAY,                            -1, -1,
+    IMG_GATE_3_GRAY
   },
   {
-    EL_GATE_4_GRAY_OPEN,                       -1, -1,
-    IMG_GATE_4_GRAY_OPEN
+    EL_GATE_4_GRAY,                            -1, -1,
+    IMG_GATE_4_GRAY
   },
   {
     EL_GAME_OF_LIFE,                           -1, -1,
index e858c30bd450e1a1cb82fe6fc58d1051b1c6cb0c..0fef9ca377780a9c155532b07823b245a90aa463 100644 (file)
@@ -257,7 +257,7 @@ element_to_sound[] =
     SND_CLASS_KEY_COLLECTING
   },
   {
-    EL_GATE_1_CLOSED, TRUE,                    ACTION_PASSING,
+    EL_GATE_1, TRUE,                           ACTION_PASSING,
     SND_CLASS_GATE_PASSING
   },
   {
index b8631004743f043e705d934182a44604381fc321..12aec7994b2ae5afb03f5612f9b0e0d4518c116e 100644 (file)
@@ -80,20 +80,20 @@ element_to_special_graphic[] =
     IMG_AMOEBA_DEAD_EDITOR
   },
   {
-    EL_EM_GATE_1_GRAY_CLOSED,                  GFX_SPECIAL_ARG_EDITOR,
-    IMG_EM_GATE_1_GRAY_CLOSED_EDITOR
+    EL_EM_GATE_1_GRAY,                         GFX_SPECIAL_ARG_EDITOR,
+    IMG_EM_GATE_1_GRAY_EDITOR
   },
   {
-    EL_EM_GATE_2_GRAY_CLOSED,                  GFX_SPECIAL_ARG_EDITOR,
-    IMG_EM_GATE_2_GRAY_CLOSED_EDITOR
+    EL_EM_GATE_2_GRAY,                         GFX_SPECIAL_ARG_EDITOR,
+    IMG_EM_GATE_2_GRAY_EDITOR
   },
   {
-    EL_EM_GATE_3_GRAY_CLOSED,                  GFX_SPECIAL_ARG_EDITOR,
-    IMG_EM_GATE_3_GRAY_CLOSED_EDITOR
+    EL_EM_GATE_3_GRAY,                         GFX_SPECIAL_ARG_EDITOR,
+    IMG_EM_GATE_3_GRAY_EDITOR
   },
   {
-    EL_EM_GATE_4_GRAY_CLOSED,                  GFX_SPECIAL_ARG_EDITOR,
-    IMG_EM_GATE_4_GRAY_CLOSED_EDITOR
+    EL_EM_GATE_4_GRAY,                         GFX_SPECIAL_ARG_EDITOR,
+    IMG_EM_GATE_4_GRAY_EDITOR
   },
   {
     EL_INVISIBLE_STEELWALL,                    GFX_SPECIAL_ARG_EDITOR,
@@ -124,20 +124,20 @@ element_to_special_graphic[] =
     IMG_KEY_4_EDITOR
   },
   {
-    EL_GATE_1_GRAY_CLOSED,                     GFX_SPECIAL_ARG_EDITOR,
-    IMG_GATE_1_GRAY_CLOSED_EDITOR
+    EL_GATE_1_GRAY,                            GFX_SPECIAL_ARG_EDITOR,
+    IMG_GATE_1_GRAY_EDITOR
   },
   {
-    EL_GATE_2_GRAY_CLOSED,                     GFX_SPECIAL_ARG_EDITOR,
-    IMG_GATE_2_GRAY_CLOSED_EDITOR
+    EL_GATE_2_GRAY,                            GFX_SPECIAL_ARG_EDITOR,
+    IMG_GATE_2_GRAY_EDITOR
   },
   {
-    EL_GATE_3_GRAY_CLOSED,                     GFX_SPECIAL_ARG_EDITOR,
-    IMG_GATE_3_GRAY_CLOSED_EDITOR
+    EL_GATE_3_GRAY,                            GFX_SPECIAL_ARG_EDITOR,
+    IMG_GATE_3_GRAY_EDITOR
   },
   {
-    EL_GATE_4_GRAY_CLOSED,                     GFX_SPECIAL_ARG_EDITOR,
-    IMG_GATE_4_GRAY_CLOSED_EDITOR
+    EL_GATE_4_GRAY,                            GFX_SPECIAL_ARG_EDITOR,
+    IMG_GATE_4_GRAY_EDITOR
   },
   {
     EL_LAMP,                                   GFX_SPECIAL_ARG_EDITOR,
index 95a9ce6411aae4fbfc7cbf1c3cafececbf10a6a6..2b58e36c0c730f43300b1d6f60813fc38ed619df 100644 (file)
@@ -1005,82 +1005,50 @@ struct ConfigInfo image_config[] =
   { "em_key_4.ypos",                           "6"                     },
   { "em_key_4.frames",                         "1"                     },
 
-  { "em_gate_1_closed",                                "RocksSP.pcx"           },
-  { "em_gate_1_closed.xpos",                   "0"                     },
-  { "em_gate_1_closed.ypos",                   "7"                     },
-  { "em_gate_1_closed.frames",                 "1"                     },
-  { "em_gate_1_open",                          "RocksSP.pcx"           },
-  { "em_gate_1_open.xpos",                     "0"                     },
-  { "em_gate_1_open.ypos",                     "7"                     },
-  { "em_gate_1_open.frames",                   "1"                     },
-  { "em_gate_2_closed",                                "RocksSP.pcx"           },
-  { "em_gate_2_closed.xpos",                   "1"                     },
-  { "em_gate_2_closed.ypos",                   "7"                     },
-  { "em_gate_2_closed.frames",                 "1"                     },
-  { "em_gate_2_open",                          "RocksSP.pcx"           },
-  { "em_gate_2_open.xpos",                     "1"                     },
-  { "em_gate_2_open.ypos",                     "7"                     },
-  { "em_gate_2_open.frames",                   "1"                     },
-  { "em_gate_3_closed",                                "RocksSP.pcx"           },
-  { "em_gate_3_closed.xpos",                   "2"                     },
-  { "em_gate_3_closed.ypos",                   "7"                     },
-  { "em_gate_3_closed.frames",                 "1"                     },
-  { "em_gate_3_open",                          "RocksSP.pcx"           },
-  { "em_gate_3_open.xpos",                     "2"                     },
-  { "em_gate_3_open.ypos",                     "7"                     },
-  { "em_gate_3_open.frames",                   "1"                     },
-  { "em_gate_4_closed",                                "RocksSP.pcx"           },
-  { "em_gate_4_closed.xpos",                   "3"                     },
-  { "em_gate_4_closed.ypos",                   "7"                     },
-  { "em_gate_4_closed.frames",                 "1"                     },
-  { "em_gate_4_open",                          "RocksSP.pcx"           },
-  { "em_gate_4_open.xpos",                     "3"                     },
-  { "em_gate_4_open.ypos",                     "7"                     },
-  { "em_gate_4_open.frames",                   "1"                     },
-  { "em_gate_1_gray_closed",                   "RocksSP.pcx"           },
-  { "em_gate_1_gray_closed.xpos",              "4"                     },
-  { "em_gate_1_gray_closed.ypos",              "7"                     },
-  { "em_gate_1_gray_closed.frames",            "1"                     },
-  { "em_gate_1_gray_closed.EDITOR",            "RocksSP.pcx"           },
-  { "em_gate_1_gray_closed.EDITOR.xpos",       "12"                    },
-  { "em_gate_1_gray_closed.EDITOR.ypos",       "11"                    },
-  { "em_gate_1_gray_open",                     "RocksSP.pcx"           },
-  { "em_gate_1_gray_open.xpos",                        "4"                     },
-  { "em_gate_1_gray_open.ypos",                        "7"                     },
-  { "em_gate_1_gray_open.frames",              "1"                     },
-  { "em_gate_2_gray_closed",                   "RocksSP.pcx"           },
-  { "em_gate_2_gray_closed.xpos",              "5"                     },
-  { "em_gate_2_gray_closed.ypos",              "7"                     },
-  { "em_gate_2_gray_closed.frames",            "1"                     },
-  { "em_gate_2_gray_closed.EDITOR",            "RocksSP.pcx"           },
-  { "em_gate_2_gray_closed.EDITOR.xpos",       "13"                    },
-  { "em_gate_2_gray_closed.EDITOR.ypos",       "11"                    },
-  { "em_gate_2_gray_open",                     "RocksSP.pcx"           },
-  { "em_gate_2_gray_open.xpos",                        "5"                     },
-  { "em_gate_2_gray_open.ypos",                        "7"                     },
-  { "em_gate_2_gray_open.frames",              "1"                     },
-  { "em_gate_3_gray_closed",                   "RocksSP.pcx"           },
-  { "em_gate_3_gray_closed.xpos",              "6"                     },
-  { "em_gate_3_gray_closed.ypos",              "7"                     },
-  { "em_gate_3_gray_closed.frames",            "1"                     },
-  { "em_gate_3_gray_closed.EDITOR",            "RocksSP.pcx"           },
-  { "em_gate_3_gray_closed.EDITOR.xpos",       "14"                    },
-  { "em_gate_3_gray_closed.EDITOR.ypos",       "11"                    },
-  { "em_gate_3_gray_open",                     "RocksSP.pcx"           },
-  { "em_gate_3_gray_open.xpos",                        "6"                     },
-  { "em_gate_3_gray_open.ypos",                        "7"                     },
-  { "em_gate_3_gray_open.frames",              "1"                     },
-  { "em_gate_4_gray_closed",                   "RocksSP.pcx"           },
-  { "em_gate_4_gray_closed.xpos",              "7"                     },
-  { "em_gate_4_gray_closed.ypos",              "7"                     },
-  { "em_gate_4_gray_closed.frames",            "1"                     },
-  { "em_gate_4_gray_closed.EDITOR",            "RocksSP.pcx"           },
-  { "em_gate_4_gray_closed.EDITOR.xpos",       "15"                    },
-  { "em_gate_4_gray_closed.EDITOR.ypos",       "11"                    },
-  { "em_gate_4_gray_open",                     "RocksSP.pcx"           },
-  { "em_gate_4_gray_open.xpos",                        "7"                     },
-  { "em_gate_4_gray_open.ypos",                        "7"                     },
-  { "em_gate_4_gray_open.frames",              "1"                     },
+  { "em_gate_1",                               "RocksSP.pcx"           },
+  { "em_gate_1.xpos",                          "0"                     },
+  { "em_gate_1.ypos",                          "7"                     },
+  { "em_gate_1.frames",                                "1"                     },
+  { "em_gate_2",                               "RocksSP.pcx"           },
+  { "em_gate_2.xpos",                          "1"                     },
+  { "em_gate_2.ypos",                          "7"                     },
+  { "em_gate_2.frames",                                "1"                     },
+  { "em_gate_3",                               "RocksSP.pcx"           },
+  { "em_gate_3.xpos",                          "2"                     },
+  { "em_gate_3.ypos",                          "7"                     },
+  { "em_gate_3.frames",                                "1"                     },
+  { "em_gate_4",                               "RocksSP.pcx"           },
+  { "em_gate_4.xpos",                          "3"                     },
+  { "em_gate_4.ypos",                          "7"                     },
+  { "em_gate_4.frames",                                "1"                     },
+  { "em_gate_1_gray",                          "RocksSP.pcx"           },
+  { "em_gate_1_gray.xpos",                     "4"                     },
+  { "em_gate_1_gray.ypos",                     "7"                     },
+  { "em_gate_1_gray.frames",                   "1"                     },
+  { "em_gate_1_gray.EDITOR",                   "RocksSP.pcx"           },
+  { "em_gate_1_gray.EDITOR.xpos",              "12"                    },
+  { "em_gate_1_gray.EDITOR.ypos",              "11"                    },
+  { "em_gate_2_gray",                          "RocksSP.pcx"           },
+  { "em_gate_2_gray.xpos",                     "5"                     },
+  { "em_gate_2_gray.ypos",                     "7"                     },
+  { "em_gate_2_gray.frames",                   "1"                     },
+  { "em_gate_2_gray.EDITOR",                   "RocksSP.pcx"           },
+  { "em_gate_2_gray.EDITOR.xpos",              "13"                    },
+  { "em_gate_2_gray.EDITOR.ypos",              "11"                    },
+  { "em_gate_3_gray",                          "RocksSP.pcx"           },
+  { "em_gate_3_gray.xpos",                     "6"                     },
+  { "em_gate_3_gray.ypos",                     "7"                     },
+  { "em_gate_3_gray.frames",                   "1"                     },
+  { "em_gate_3_gray.EDITOR",                   "RocksSP.pcx"           },
+  { "em_gate_3_gray.EDITOR.xpos",              "14"                    },
+  { "em_gate_3_gray.EDITOR.ypos",              "11"                    },
+  { "em_gate_4_gray",                          "RocksSP.pcx"           },
+  { "em_gate_4_gray.xpos",                     "7"                     },
+  { "em_gate_4_gray.ypos",                     "7"                     },
+  { "em_gate_4_gray.frames",                   "1"                     },
+  { "em_gate_4_gray.EDITOR",                   "RocksSP.pcx"           },
+  { "em_gate_4_gray.EDITOR.xpos",              "15"                    },
+  { "em_gate_4_gray.EDITOR.ypos",              "11"                    },
 
   { "exit_closed",                             "RocksElements.pcx"     },
   { "exit_closed.xpos",                                "0"                     },
@@ -1642,82 +1610,50 @@ struct ConfigInfo image_config[] =
   { "key_4.EDITOR.xpos",                       "7"                     },
   { "key_4.EDITOR.ypos",                       "14"                    },
 
-  { "gate_1_closed",                           "RocksElements.pcx"     },
-  { "gate_1_closed.xpos",                      "4"                     },
-  { "gate_1_closed.ypos",                      "2"                     },
-  { "gate_1_closed.frames",                    "1"                     },
-  { "gate_1_open",                             "RocksElements.pcx"     },
-  { "gate_1_open.xpos",                                "4"                     },
-  { "gate_1_open.ypos",                                "2"                     },
-  { "gate_1_open.frames",                      "1"                     },
-  { "gate_2_closed",                           "RocksElements.pcx"     },
-  { "gate_2_closed.xpos",                      "5"                     },
-  { "gate_2_closed.ypos",                      "2"                     },
-  { "gate_2_closed.frames",                    "1"                     },
-  { "gate_2_open",                             "RocksElements.pcx"     },
-  { "gate_2_open.xpos",                                "5"                     },
-  { "gate_2_open.ypos",                                "2"                     },
-  { "gate_2_open.frames",                      "1"                     },
-  { "gate_3_closed",                           "RocksElements.pcx"     },
-  { "gate_3_closed.xpos",                      "6"                     },
-  { "gate_3_closed.ypos",                      "2"                     },
-  { "gate_3_closed.frames",                    "1"                     },
-  { "gate_3_open",                             "RocksElements.pcx"     },
-  { "gate_3_open.xpos",                                "6"                     },
-  { "gate_3_open.ypos",                                "2"                     },
-  { "gate_3_open.frames",                      "1"                     },
-  { "gate_4_closed",                           "RocksElements.pcx"     },
-  { "gate_4_closed.xpos",                      "7"                     },
-  { "gate_4_closed.ypos",                      "2"                     },
-  { "gate_4_closed.frames",                    "1"                     },
-  { "gate_4_open",                             "RocksElements.pcx"     },
-  { "gate_4_open.xpos",                                "7"                     },
-  { "gate_4_open.ypos",                                "2"                     },
-  { "gate_4_open.frames",                      "1"                     },
-  { "gate_1_gray_closed",                      "RocksElements.pcx"     },
-  { "gate_1_gray_closed.xpos",                 "8"                     },
-  { "gate_1_gray_closed.ypos",                 "2"                     },
-  { "gate_1_gray_closed.frames",               "1"                     },
-  { "gate_1_gray_closed.EDITOR",               "RocksElements.pcx"     },
-  { "gate_1_gray_closed.EDITOR.xpos",          "8"                     },
-  { "gate_1_gray_closed.EDITOR.ypos",          "14"                    },
-  { "gate_1_gray_open",                                "RocksElements.pcx"     },
-  { "gate_1_gray_open.xpos",                   "8"                     },
-  { "gate_1_gray_open.ypos",                   "2"                     },
-  { "gate_1_gray_open.frames",                 "1"                     },
-  { "gate_2_gray_closed",                      "RocksElements.pcx"     },
-  { "gate_2_gray_closed.xpos",                 "9"                     },
-  { "gate_2_gray_closed.ypos",                 "2"                     },
-  { "gate_2_gray_closed.frames",               "1"                     },
-  { "gate_2_gray_closed.EDITOR",               "RocksElements.pcx"     },
-  { "gate_2_gray_closed.EDITOR.xpos",          "9"                     },
-  { "gate_2_gray_closed.EDITOR.ypos",          "14"                    },
-  { "gate_2_gray_open",                                "RocksElements.pcx"     },
-  { "gate_2_gray_open.xpos",                   "9"                     },
-  { "gate_2_gray_open.ypos",                   "2"                     },
-  { "gate_2_gray_open.frames",                 "1"                     },
-  { "gate_3_gray_closed",                      "RocksElements.pcx"     },
-  { "gate_3_gray_closed.xpos",                 "10"                    },
-  { "gate_3_gray_closed.ypos",                 "2"                     },
-  { "gate_3_gray_closed.frames",               "1"                     },
-  { "gate_3_gray_closed.EDITOR",               "RocksElements.pcx"     },
-  { "gate_3_gray_closed.EDITOR.xpos",          "10"                    },
-  { "gate_3_gray_closed.EDITOR.ypos",          "14"                    },
-  { "gate_3_gray_open",                                "RocksElements.pcx"     },
-  { "gate_3_gray_open.xpos",                   "10"                    },
-  { "gate_3_gray_open.ypos",                   "2"                     },
-  { "gate_3_gray_open.frames",                 "1"                     },
-  { "gate_4_gray_closed",                      "RocksElements.pcx"     },
-  { "gate_4_gray_closed.xpos",                 "11"                    },
-  { "gate_4_gray_closed.ypos",                 "2"                     },
-  { "gate_4_gray_closed.frames",               "1"                     },
-  { "gate_4_gray_closed.EDITOR",               "RocksElements.pcx"     },
-  { "gate_4_gray_closed.EDITOR.xpos",          "11"                    },
-  { "gate_4_gray_closed.EDITOR.ypos",          "14"                    },
-  { "gate_4_gray_open",                                "RocksElements.pcx"     },
-  { "gate_4_gray_open.xpos",                   "11"                    },
-  { "gate_4_gray_open.ypos",                   "2"                     },
-  { "gate_4_gray_open.frames",                 "1"                     },
+  { "gate_1",                                  "RocksElements.pcx"     },
+  { "gate_1.xpos",                             "4"                     },
+  { "gate_1.ypos",                             "2"                     },
+  { "gate_1.frames",                           "1"                     },
+  { "gate_2",                                  "RocksElements.pcx"     },
+  { "gate_2.xpos",                             "5"                     },
+  { "gate_2.ypos",                             "2"                     },
+  { "gate_2.frames",                           "1"                     },
+  { "gate_3",                                  "RocksElements.pcx"     },
+  { "gate_3.xpos",                             "6"                     },
+  { "gate_3.ypos",                             "2"                     },
+  { "gate_3.frames",                           "1"                     },
+  { "gate_4",                                  "RocksElements.pcx"     },
+  { "gate_4.xpos",                             "7"                     },
+  { "gate_4.ypos",                             "2"                     },
+  { "gate_4.frames",                           "1"                     },
+  { "gate_1_gray",                             "RocksElements.pcx"     },
+  { "gate_1_gray.xpos",                                "8"                     },
+  { "gate_1_gray.ypos",                                "2"                     },
+  { "gate_1_gray.frames",                      "1"                     },
+  { "gate_1_gray.EDITOR",                      "RocksElements.pcx"     },
+  { "gate_1_gray.EDITOR.xpos",                 "8"                     },
+  { "gate_1_gray.EDITOR.ypos",                 "14"                    },
+  { "gate_2_gray",                             "RocksElements.pcx"     },
+  { "gate_2_gray.xpos",                                "9"                     },
+  { "gate_2_gray.ypos",                                "2"                     },
+  { "gate_2_gray.frames",                      "1"                     },
+  { "gate_2_gray.EDITOR",                      "RocksElements.pcx"     },
+  { "gate_2_gray.EDITOR.xpos",                 "9"                     },
+  { "gate_2_gray.EDITOR.ypos",                 "14"                    },
+  { "gate_3_gray",                             "RocksElements.pcx"     },
+  { "gate_3_gray.xpos",                                "10"                    },
+  { "gate_3_gray.ypos",                                "2"                     },
+  { "gate_3_gray.frames",                      "1"                     },
+  { "gate_3_gray.EDITOR",                      "RocksElements.pcx"     },
+  { "gate_3_gray.EDITOR.xpos",                 "10"                    },
+  { "gate_3_gray.EDITOR.ypos",                 "14"                    },
+  { "gate_4_gray",                             "RocksElements.pcx"     },
+  { "gate_4_gray.xpos",                                "11"                    },
+  { "gate_4_gray.ypos",                                "2"                     },
+  { "gate_4_gray.frames",                      "1"                     },
+  { "gate_4_gray.EDITOR",                      "RocksElements.pcx"     },
+  { "gate_4_gray.EDITOR.xpos",                 "11"                    },
+  { "gate_4_gray.EDITOR.ypos",                 "14"                    },
 
   { "game_of_life",                            "RocksElements.pcx"     },
   { "game_of_life.xpos",                       "8"                     },
index 00196740d6f5a5da78a36a7afd4e96d33cd2c243..76452cdc84e8ba1501e7b8ffed99bddf00d90662 100644 (file)
 #define IMG_EM_KEY_2                                   190
 #define IMG_EM_KEY_3                                   191
 #define IMG_EM_KEY_4                                   192
-#define IMG_EM_GATE_1_CLOSED                           193
-#define IMG_EM_GATE_1_OPEN                             194
-#define IMG_EM_GATE_2_CLOSED                           195
-#define IMG_EM_GATE_2_OPEN                             196
-#define IMG_EM_GATE_3_CLOSED                           197
-#define IMG_EM_GATE_3_OPEN                             198
-#define IMG_EM_GATE_4_CLOSED                           199
-#define IMG_EM_GATE_4_OPEN                             200
-#define IMG_EM_GATE_1_GRAY_CLOSED                      201
-#define IMG_EM_GATE_1_GRAY_CLOSED_EDITOR               202
-#define IMG_EM_GATE_1_GRAY_OPEN                                203
-#define IMG_EM_GATE_2_GRAY_CLOSED                      204
-#define IMG_EM_GATE_2_GRAY_CLOSED_EDITOR               205
-#define IMG_EM_GATE_2_GRAY_OPEN                                206
-#define IMG_EM_GATE_3_GRAY_CLOSED                      207
-#define IMG_EM_GATE_3_GRAY_CLOSED_EDITOR               208
-#define IMG_EM_GATE_3_GRAY_OPEN                                209
-#define IMG_EM_GATE_4_GRAY_CLOSED                      210
-#define IMG_EM_GATE_4_GRAY_CLOSED_EDITOR               211
-#define IMG_EM_GATE_4_GRAY_OPEN                                212
-#define IMG_EXIT_CLOSED                                        213
-#define IMG_EXIT_OPENING                               214
-#define IMG_EXIT_OPEN                                  215
-#define IMG_BALLOON                                    216
-#define IMG_BALLOON_MOVING                             217
-#define IMG_BALLOON_SWITCH_LEFT                                218
-#define IMG_BALLOON_SWITCH_RIGHT                       219
-#define IMG_BALLOON_SWITCH_UP                          220
-#define IMG_BALLOON_SWITCH_DOWN                                221
-#define IMG_BALLOON_SWITCH_ANY                         222
-#define IMG_SPRING                                     223
-#define IMG_SPRING_MOVING                              224
-#define IMG_EMC_STEELWALL_1                            225
-#define IMG_EMC_STEELWALL_2                            226
-#define IMG_EMC_STEELWALL_3                            227
-#define IMG_EMC_STEELWALL_4                            228
-#define IMG_EMC_WALL_1                                 229
-#define IMG_EMC_WALL_2                                 230
-#define IMG_EMC_WALL_3                                 231
-#define IMG_EMC_WALL_4                                 232
-#define IMG_EMC_WALL_5                                 233
-#define IMG_EMC_WALL_6                                 234
-#define IMG_EMC_WALL_7                                 235
-#define IMG_EMC_WALL_8                                 236
-#define IMG_INVISIBLE_STEELWALL                                237
-#define IMG_INVISIBLE_STEELWALL_EDITOR                 238
-#define IMG_INVISIBLE_STEELWALL_ACTIVE                 239
-#define IMG_INVISIBLE_WALL                             240
-#define IMG_INVISIBLE_WALL_EDITOR                      241
-#define IMG_INVISIBLE_WALL_ACTIVE                      242
-#define IMG_INVISIBLE_SAND                             243
-#define IMG_INVISIBLE_SAND_EDITOR                      244
-#define IMG_INVISIBLE_SAND_ACTIVE                      245
-#define IMG_CONVEYOR_BELT_1_MIDDLE                     246
-#define IMG_CONVEYOR_BELT_1_MIDDLE_ACTIVE              247
-#define IMG_CONVEYOR_BELT_1_LEFT                       248
-#define IMG_CONVEYOR_BELT_1_LEFT_ACTIVE                        249
-#define IMG_CONVEYOR_BELT_1_RIGHT                      250
-#define IMG_CONVEYOR_BELT_1_RIGHT_ACTIVE               251
-#define IMG_CONVEYOR_BELT_1_SWITCH_LEFT                        252
-#define IMG_CONVEYOR_BELT_1_SWITCH_MIDDLE              253
-#define IMG_CONVEYOR_BELT_1_SWITCH_RIGHT               254
-#define IMG_CONVEYOR_BELT_2_MIDDLE                     255
-#define IMG_CONVEYOR_BELT_2_MIDDLE_ACTIVE              256
-#define IMG_CONVEYOR_BELT_2_LEFT                       257
-#define IMG_CONVEYOR_BELT_2_LEFT_ACTIVE                        258
-#define IMG_CONVEYOR_BELT_2_RIGHT                      259
-#define IMG_CONVEYOR_BELT_2_RIGHT_ACTIVE               260
-#define IMG_CONVEYOR_BELT_2_SWITCH_LEFT                        261
-#define IMG_CONVEYOR_BELT_2_SWITCH_MIDDLE              262
-#define IMG_CONVEYOR_BELT_2_SWITCH_RIGHT               263
-#define IMG_CONVEYOR_BELT_3_MIDDLE                     264
-#define IMG_CONVEYOR_BELT_3_MIDDLE_ACTIVE              265
-#define IMG_CONVEYOR_BELT_3_LEFT                       266
-#define IMG_CONVEYOR_BELT_3_LEFT_ACTIVE                        267
-#define IMG_CONVEYOR_BELT_3_RIGHT                      268
-#define IMG_CONVEYOR_BELT_3_RIGHT_ACTIVE               269
-#define IMG_CONVEYOR_BELT_3_SWITCH_LEFT                        270
-#define IMG_CONVEYOR_BELT_3_SWITCH_MIDDLE              271
-#define IMG_CONVEYOR_BELT_3_SWITCH_RIGHT               272
-#define IMG_CONVEYOR_BELT_4_MIDDLE                     273
-#define IMG_CONVEYOR_BELT_4_MIDDLE_ACTIVE              274
-#define IMG_CONVEYOR_BELT_4_LEFT                       275
-#define IMG_CONVEYOR_BELT_4_LEFT_ACTIVE                        276
-#define IMG_CONVEYOR_BELT_4_RIGHT                      277
-#define IMG_CONVEYOR_BELT_4_RIGHT_ACTIVE               278
-#define IMG_CONVEYOR_BELT_4_SWITCH_LEFT                        279
-#define IMG_CONVEYOR_BELT_4_SWITCH_MIDDLE              280
-#define IMG_CONVEYOR_BELT_4_SWITCH_RIGHT               281
-#define IMG_SWITCHGATE_SWITCH_UP                       282
-#define IMG_SWITCHGATE_SWITCH_DOWN                     283
-#define IMG_LIGHT_SWITCH                               284
-#define IMG_LIGHT_SWITCH_ACTIVE                                285
-#define IMG_TIMEGATE_SWITCH                            286
-#define IMG_TIMEGATE_SWITCH_ACTIVE                     287
-#define IMG_ENVELOPE                                   288
-#define IMG_SIGN_EXCLAMATION                           289
-#define IMG_SIGN_STOP                                  290
-#define IMG_LANDMINE                                   291
-#define IMG_STEELWALL_SLANTED                          292
-#define IMG_EXTRA_TIME                                 293
-#define IMG_SHIELD_NORMAL                              294
-#define IMG_SHIELD_NORMAL_ACTIVE                       295
-#define IMG_SHIELD_DEADLY                              296
-#define IMG_SHIELD_DEADLY_ACTIVE                       297
-#define IMG_SWITCHGATE_CLOSED                          298
-#define IMG_SWITCHGATE_OPENING                         299
-#define IMG_SWITCHGATE_OPEN                            300
-#define IMG_SWITCHGATE_CLOSING                         301
-#define IMG_TIMEGATE_CLOSED                            302
-#define IMG_TIMEGATE_OPENING                           303
-#define IMG_TIMEGATE_OPEN                              304
-#define IMG_TIMEGATE_CLOSING                           305
-#define IMG_PEARL                                      306
-#define IMG_PEARL_BREAKING                             307
-#define IMG_CRYSTAL                                    308
-#define IMG_WALL_PEARL                                 309
-#define IMG_WALL_CRYSTAL                               310
-#define IMG_TUBE_RIGHT_DOWN                            311
-#define IMG_TUBE_HORIZONTAL_DOWN                       312
-#define IMG_TUBE_LEFT_DOWN                             313
-#define IMG_TUBE_HORIZONTAL                            314
-#define IMG_TUBE_VERTICAL_RIGHT                                315
-#define IMG_TUBE_ANY                                   316
-#define IMG_TUBE_VERTICAL_LEFT                         317
-#define IMG_TUBE_VERTICAL                              318
-#define IMG_TUBE_RIGHT_UP                              319
-#define IMG_TUBE_HORIZONTAL_UP                         320
-#define IMG_TUBE_LEFT_UP                               321
-#define IMG_TRAP                                       322
-#define IMG_TRAP_ACTIVE                                        323
-#define IMG_DX_SUPABOMB                                        324
-#define IMG_KEY_1                                      325
-#define IMG_KEY_1_EDITOR                               326
-#define IMG_KEY_2                                      327
-#define IMG_KEY_2_EDITOR                               328
-#define IMG_KEY_3                                      329
-#define IMG_KEY_3_EDITOR                               330
-#define IMG_KEY_4                                      331
-#define IMG_KEY_4_EDITOR                               332
-#define IMG_GATE_1_CLOSED                              333
-#define IMG_GATE_1_OPEN                                        334
-#define IMG_GATE_2_CLOSED                              335
-#define IMG_GATE_2_OPEN                                        336
-#define IMG_GATE_3_CLOSED                              337
-#define IMG_GATE_3_OPEN                                        338
-#define IMG_GATE_4_CLOSED                              339
-#define IMG_GATE_4_OPEN                                        340
-#define IMG_GATE_1_GRAY_CLOSED                         341
-#define IMG_GATE_1_GRAY_CLOSED_EDITOR                  342
-#define IMG_GATE_1_GRAY_OPEN                           343
-#define IMG_GATE_2_GRAY_CLOSED                         344
-#define IMG_GATE_2_GRAY_CLOSED_EDITOR                  345
-#define IMG_GATE_2_GRAY_OPEN                           346
-#define IMG_GATE_3_GRAY_CLOSED                         347
-#define IMG_GATE_3_GRAY_CLOSED_EDITOR                  348
-#define IMG_GATE_3_GRAY_OPEN                           349
-#define IMG_GATE_4_GRAY_CLOSED                         350
-#define IMG_GATE_4_GRAY_CLOSED_EDITOR                  351
-#define IMG_GATE_4_GRAY_OPEN                           352
-#define IMG_GAME_OF_LIFE                               353
-#define IMG_BIOMAZE                                    354
-#define IMG_PACMAN_RIGHT                               355
-#define IMG_PACMAN_UP                                  356
-#define IMG_PACMAN_LEFT                                        357
-#define IMG_PACMAN_DOWN                                        358
-#define IMG_LAMP                                       359
-#define IMG_LAMP_EDITOR                                        360
-#define IMG_LAMP_ACTIVE                                        361
-#define IMG_TIME_ORB_FULL                              362
-#define IMG_TIME_ORB_EMPTY                             363
-#define IMG_EMERALD_YELLOW                             364
-#define IMG_EMERALD_YELLOW_MOVING                      365
-#define IMG_EMERALD_YELLOW_FALLING                     366
-#define IMG_EMERALD_RED                                        367
-#define IMG_EMERALD_RED_MOVING                         368
-#define IMG_EMERALD_RED_FALLING                                369
-#define IMG_EMERALD_PURPLE                             370
-#define IMG_EMERALD_PURPLE_MOVING                      371
-#define IMG_EMERALD_PURPLE_FALLING                     372
-#define IMG_WALL_EMERALD_YELLOW                                373
-#define IMG_WALL_EMERALD_RED                           374
-#define IMG_WALL_EMERALD_PURPLE                                375
-#define IMG_WALL_BD_DIAMOND                            376
-#define IMG_EXPANDABLE_WALL                            377
-#define IMG_EXPANDABLE_WALL_HORIZONTAL                 378
-#define IMG_EXPANDABLE_WALL_HORIZONTAL_EDITOR          379
-#define IMG_EXPANDABLE_WALL_VERTICAL                   380
-#define IMG_EXPANDABLE_WALL_VERTICAL_EDITOR            381
-#define IMG_EXPANDABLE_WALL_ANY                                382
-#define IMG_EXPANDABLE_WALL_ANY_EDITOR                 383
-#define IMG_EXPANDABLE_WALL_GROWING_LEFT               384
-#define IMG_EXPANDABLE_WALL_GROWING_RIGHT              385
-#define IMG_EXPANDABLE_WALL_GROWING_UP                 386
-#define IMG_EXPANDABLE_WALL_GROWING_DOWN               387
-#define IMG_BLACK_ORB                                  388
-#define IMG_SPEED_PILL                                 389
-#define IMG_DARK_YAMYAM                                        390
-#define IMG_DYNABOMB_ACTIVE                            391
-#define IMG_DYNABOMB_PLAYER_1_ACTIVE                   392
-#define IMG_DYNABOMB_PLAYER_2_ACTIVE                   393
-#define IMG_DYNABOMB_PLAYER_3_ACTIVE                   394
-#define IMG_DYNABOMB_PLAYER_4_ACTIVE                   395
-#define IMG_DYNABOMB_INCREASE_NUMBER                   396
-#define IMG_DYNABOMB_INCREASE_SIZE                     397
-#define IMG_DYNABOMB_INCREASE_POWER                    398
-#define IMG_PIG                                                399
-#define IMG_PIG_DOWN                                   400
-#define IMG_PIG_UP                                     401
-#define IMG_PIG_LEFT                                   402
-#define IMG_PIG_RIGHT                                  403
-#define IMG_PIG_MOVING_DOWN                            404
-#define IMG_PIG_MOVING_UP                              405
-#define IMG_PIG_MOVING_LEFT                            406
-#define IMG_PIG_MOVING_RIGHT                           407
-#define IMG_PIG_DIGGING_DOWN                           408
-#define IMG_PIG_DIGGING_UP                             409
-#define IMG_PIG_DIGGING_LEFT                           410
-#define IMG_PIG_DIGGING_RIGHT                          411
-#define IMG_DRAGON                                     412
-#define IMG_DRAGON_DOWN                                        413
-#define IMG_DRAGON_UP                                  414
-#define IMG_DRAGON_LEFT                                        415
-#define IMG_DRAGON_RIGHT                               416
-#define IMG_DRAGON_MOVING_DOWN                         417
-#define IMG_DRAGON_MOVING_UP                           418
-#define IMG_DRAGON_MOVING_LEFT                         419
-#define IMG_DRAGON_MOVING_RIGHT                                420
-#define IMG_DRAGON_ATTACKING_DOWN                      421
-#define IMG_DRAGON_ATTACKING_UP                                422
-#define IMG_DRAGON_ATTACKING_LEFT                      423
-#define IMG_DRAGON_ATTACKING_RIGHT                     424
-#define IMG_MOLE                                       425
-#define IMG_MOLE_DOWN                                  426
-#define IMG_MOLE_UP                                    427
-#define IMG_MOLE_LEFT                                  428
-#define IMG_MOLE_RIGHT                                 429
-#define IMG_MOLE_MOVING_DOWN                           430
-#define IMG_MOLE_MOVING_UP                             431
-#define IMG_MOLE_MOVING_LEFT                           432
-#define IMG_MOLE_MOVING_RIGHT                          433
-#define IMG_MOLE_DIGGING_DOWN                          434
-#define IMG_MOLE_DIGGING_UP                            435
-#define IMG_MOLE_DIGGING_LEFT                          436
-#define IMG_MOLE_DIGGING_RIGHT                         437
-#define IMG_PENGUIN                                    438
-#define IMG_PENGUIN_EDITOR                             439
-#define IMG_PENGUIN_DOWN                               440
-#define IMG_PENGUIN_UP                                 441
-#define IMG_PENGUIN_LEFT                               442
-#define IMG_PENGUIN_RIGHT                              443
-#define IMG_PENGUIN_MOVING_DOWN                                444
-#define IMG_PENGUIN_MOVING_UP                          445
-#define IMG_PENGUIN_MOVING_LEFT                                446
-#define IMG_PENGUIN_MOVING_RIGHT                       447
-#define IMG_SATELLITE                                  448
-#define IMG_SATELLITE_MOVING                           449
-#define IMG_FLAMES_1_LEFT                              450
-#define IMG_FLAMES_2_LEFT                              451
-#define IMG_FLAMES_3_LEFT                              452
-#define IMG_FLAMES_1_RIGHT                             453
-#define IMG_FLAMES_2_RIGHT                             454
-#define IMG_FLAMES_3_RIGHT                             455
-#define IMG_FLAMES_1_UP                                        456
-#define IMG_FLAMES_2_UP                                        457
-#define IMG_FLAMES_3_UP                                        458
-#define IMG_FLAMES_1_DOWN                              459
-#define IMG_FLAMES_2_DOWN                              460
-#define IMG_FLAMES_3_DOWN                              461
-#define IMG_STONEBLOCK                                 462
-#define IMG_PLAYER_1                                   463
-#define IMG_PLAYER_1_EDITOR                            464
-#define IMG_PLAYER_1_DOWN                              465
-#define IMG_PLAYER_1_UP                                        466
-#define IMG_PLAYER_1_LEFT                              467
-#define IMG_PLAYER_1_RIGHT                             468
-#define IMG_PLAYER_1_MOVING_DOWN                       469
-#define IMG_PLAYER_1_MOVING_UP                         470
-#define IMG_PLAYER_1_MOVING_LEFT                       471
-#define IMG_PLAYER_1_MOVING_RIGHT                      472
-#define IMG_PLAYER_1_DIGGING_DOWN                      473
-#define IMG_PLAYER_1_DIGGING_UP                                474
-#define IMG_PLAYER_1_DIGGING_LEFT                      475
-#define IMG_PLAYER_1_DIGGING_RIGHT                     476
-#define IMG_PLAYER_1_COLLECTING_DOWN                   477
-#define IMG_PLAYER_1_COLLECTING_UP                     478
-#define IMG_PLAYER_1_COLLECTING_LEFT                   479
-#define IMG_PLAYER_1_COLLECTING_RIGHT                  480
-#define IMG_PLAYER_1_PUSHING_DOWN                      481
-#define IMG_PLAYER_1_PUSHING_UP                                482
-#define IMG_PLAYER_1_PUSHING_LEFT                      483
-#define IMG_PLAYER_1_PUSHING_RIGHT                     484
-#define IMG_PLAYER_1_SNAPPING_DOWN                     485
-#define IMG_PLAYER_1_SNAPPING_UP                       486
-#define IMG_PLAYER_1_SNAPPING_LEFT                     487
-#define IMG_PLAYER_1_SNAPPING_RIGHT                    488
-#define IMG_PLAYER_2                                   489
-#define IMG_PLAYER_2_EDITOR                            490
-#define IMG_PLAYER_2_DOWN                              491
-#define IMG_PLAYER_2_UP                                        492
-#define IMG_PLAYER_2_LEFT                              493
-#define IMG_PLAYER_2_RIGHT                             494
-#define IMG_PLAYER_2_MOVING_DOWN                       495
-#define IMG_PLAYER_2_MOVING_UP                         496
-#define IMG_PLAYER_2_MOVING_LEFT                       497
-#define IMG_PLAYER_2_MOVING_RIGHT                      498
-#define IMG_PLAYER_2_DIGGING_DOWN                      499
-#define IMG_PLAYER_2_DIGGING_UP                                500
-#define IMG_PLAYER_2_DIGGING_LEFT                      501
-#define IMG_PLAYER_2_DIGGING_RIGHT                     502
-#define IMG_PLAYER_2_COLLECTING_DOWN                   503
-#define IMG_PLAYER_2_COLLECTING_UP                     504
-#define IMG_PLAYER_2_COLLECTING_LEFT                   505
-#define IMG_PLAYER_2_COLLECTING_RIGHT                  506
-#define IMG_PLAYER_2_PUSHING_DOWN                      507
-#define IMG_PLAYER_2_PUSHING_UP                                508
-#define IMG_PLAYER_2_PUSHING_LEFT                      509
-#define IMG_PLAYER_2_PUSHING_RIGHT                     510
-#define IMG_PLAYER_2_SNAPPING_DOWN                     511
-#define IMG_PLAYER_2_SNAPPING_UP                       512
-#define IMG_PLAYER_2_SNAPPING_LEFT                     513
-#define IMG_PLAYER_2_SNAPPING_RIGHT                    514
-#define IMG_PLAYER_3                                   515
-#define IMG_PLAYER_3_EDITOR                            516
-#define IMG_PLAYER_3_DOWN                              517
-#define IMG_PLAYER_3_UP                                        518
-#define IMG_PLAYER_3_LEFT                              519
-#define IMG_PLAYER_3_RIGHT                             520
-#define IMG_PLAYER_3_MOVING_DOWN                       521
-#define IMG_PLAYER_3_MOVING_UP                         522
-#define IMG_PLAYER_3_MOVING_LEFT                       523
-#define IMG_PLAYER_3_MOVING_RIGHT                      524
-#define IMG_PLAYER_3_DIGGING_DOWN                      525
-#define IMG_PLAYER_3_DIGGING_UP                                526
-#define IMG_PLAYER_3_DIGGING_LEFT                      527
-#define IMG_PLAYER_3_DIGGING_RIGHT                     528
-#define IMG_PLAYER_3_COLLECTING_DOWN                   529
-#define IMG_PLAYER_3_COLLECTING_UP                     530
-#define IMG_PLAYER_3_COLLECTING_LEFT                   531
-#define IMG_PLAYER_3_COLLECTING_RIGHT                  532
-#define IMG_PLAYER_3_PUSHING_DOWN                      533
-#define IMG_PLAYER_3_PUSHING_UP                                534
-#define IMG_PLAYER_3_PUSHING_LEFT                      535
-#define IMG_PLAYER_3_PUSHING_RIGHT                     536
-#define IMG_PLAYER_3_SNAPPING_DOWN                     537
-#define IMG_PLAYER_3_SNAPPING_UP                       538
-#define IMG_PLAYER_3_SNAPPING_LEFT                     539
-#define IMG_PLAYER_3_SNAPPING_RIGHT                    540
-#define IMG_PLAYER_4                                   541
-#define IMG_PLAYER_4_EDITOR                            542
-#define IMG_PLAYER_4_DOWN                              543
-#define IMG_PLAYER_4_UP                                        544
-#define IMG_PLAYER_4_LEFT                              545
-#define IMG_PLAYER_4_RIGHT                             546
-#define IMG_PLAYER_4_MOVING_DOWN                       547
-#define IMG_PLAYER_4_MOVING_UP                         548
-#define IMG_PLAYER_4_MOVING_LEFT                       549
-#define IMG_PLAYER_4_MOVING_RIGHT                      550
-#define IMG_PLAYER_4_DIGGING_DOWN                      551
-#define IMG_PLAYER_4_DIGGING_UP                                552
-#define IMG_PLAYER_4_DIGGING_LEFT                      553
-#define IMG_PLAYER_4_DIGGING_RIGHT                     554
-#define IMG_PLAYER_4_COLLECTING_DOWN                   555
-#define IMG_PLAYER_4_COLLECTING_UP                     556
-#define IMG_PLAYER_4_COLLECTING_LEFT                   557
-#define IMG_PLAYER_4_COLLECTING_RIGHT                  558
-#define IMG_PLAYER_4_PUSHING_DOWN                      559
-#define IMG_PLAYER_4_PUSHING_UP                                560
-#define IMG_PLAYER_4_PUSHING_LEFT                      561
-#define IMG_PLAYER_4_PUSHING_RIGHT                     562
-#define IMG_PLAYER_4_SNAPPING_DOWN                     563
-#define IMG_PLAYER_4_SNAPPING_UP                       564
-#define IMG_PLAYER_4_SNAPPING_LEFT                     565
-#define IMG_PLAYER_4_SNAPPING_RIGHT                    566
-#define IMG_EXPLOSION                                  567
-#define IMG_TWINKLE_BLUE                               568
-#define IMG_TWINKLE_WHITE                              569
-#define IMG_STEELWALL_TOPLEFT                          570
-#define IMG_STEELWALL_TOPRIGHT                         571
-#define IMG_STEELWALL_BOTTOMLEFT                       572
-#define IMG_STEELWALL_BOTTOMRIGHT                      573
-#define IMG_STEELWALL_HORIZONTAL                       574
-#define IMG_STEELWALL_VERTICAL                         575
-#define IMG_STEELWALL_TOPLEFT_EDITOR                   576
-#define IMG_STEELWALL_TOPRIGHT_EDITOR                  577
-#define IMG_STEELWALL_BOTTOMLEFT_EDITOR                        578
-#define IMG_STEELWALL_BOTTOMRIGHT_EDITOR               579
-#define IMG_STEELWALL_HORIZONTAL_EDITOR                        580
-#define IMG_STEELWALL_VERTICAL_EDITOR                  581
-#define IMG_INVISIBLE_STEELWALL_TOPLEFT                        582
-#define IMG_INVISIBLE_STEELWALL_TOPRIGHT               583
-#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT             584
-#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT            585
-#define IMG_INVISIBLE_STEELWALL_HORIZONTAL             586
-#define IMG_INVISIBLE_STEELWALL_VERTICAL               587
-#define IMG_INVISIBLE_STEELWALL_TOPLEFT_EDITOR         588
-#define IMG_INVISIBLE_STEELWALL_TOPRIGHT_EDITOR                589
-#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT_EDITOR      590
-#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT_EDITOR     591
-#define IMG_INVISIBLE_STEELWALL_HORIZONTAL_EDITOR      592
-#define IMG_INVISIBLE_STEELWALL_VERTICAL_EDITOR                593
-#define IMG_ARROW_LEFT                                 594
-#define IMG_ARROW_RIGHT                                        595
-#define IMG_ARROW_UP                                   596
-#define IMG_ARROW_DOWN                                 597
-#define IMG_CHAR_SPACE                                 598
-#define IMG_CHAR_EXCLAM                                        599
-#define IMG_CHAR_QUOTEDBL                              600
-#define IMG_CHAR_NUMBERSIGN                            601
-#define IMG_CHAR_DOLLAR                                        602
-#define IMG_CHAR_PROCENT                               603
-#define IMG_CHAR_AMPERSAND                             604
-#define IMG_CHAR_APOSTROPHE                            605
-#define IMG_CHAR_PARENLEFT                             606
-#define IMG_CHAR_PARENRIGHT                            607
-#define IMG_CHAR_ASTERISK                              608
-#define IMG_CHAR_PLUS                                  609
-#define IMG_CHAR_COMMA                                 610
-#define IMG_CHAR_MINUS                                 611
-#define IMG_CHAR_PERIOD                                        612
-#define IMG_CHAR_SLASH                                 613
-#define IMG_CHAR_0                                     614
-#define IMG_CHAR_1                                     615
-#define IMG_CHAR_2                                     616
-#define IMG_CHAR_3                                     617
-#define IMG_CHAR_4                                     618
-#define IMG_CHAR_5                                     619
-#define IMG_CHAR_6                                     620
-#define IMG_CHAR_7                                     621
-#define IMG_CHAR_8                                     622
-#define IMG_CHAR_9                                     623
-#define IMG_CHAR_COLON                                 624
-#define IMG_CHAR_SEMICOLON                             625
-#define IMG_CHAR_LESS                                  626
-#define IMG_CHAR_EQUAL                                 627
-#define IMG_CHAR_GREATER                               628
-#define IMG_CHAR_QUESTION                              629
-#define IMG_CHAR_AT                                    630
-#define IMG_CHAR_A                                     631
-#define IMG_CHAR_B                                     632
-#define IMG_CHAR_C                                     633
-#define IMG_CHAR_D                                     634
-#define IMG_CHAR_E                                     635
-#define IMG_CHAR_F                                     636
-#define IMG_CHAR_G                                     637
-#define IMG_CHAR_H                                     638
-#define IMG_CHAR_I                                     639
-#define IMG_CHAR_J                                     640
-#define IMG_CHAR_K                                     641
-#define IMG_CHAR_L                                     642
-#define IMG_CHAR_M                                     643
-#define IMG_CHAR_N                                     644
-#define IMG_CHAR_O                                     645
-#define IMG_CHAR_P                                     646
-#define IMG_CHAR_Q                                     647
-#define IMG_CHAR_R                                     648
-#define IMG_CHAR_S                                     649
-#define IMG_CHAR_T                                     650
-#define IMG_CHAR_U                                     651
-#define IMG_CHAR_V                                     652
-#define IMG_CHAR_W                                     653
-#define IMG_CHAR_X                                     654
-#define IMG_CHAR_Y                                     655
-#define IMG_CHAR_Z                                     656
-#define IMG_CHAR_BRACKETLEFT                           657
-#define IMG_CHAR_BACKSLASH                             658
-#define IMG_CHAR_BRACKETRIGHT                          659
-#define IMG_CHAR_ASCIICIRCUM                           660
-#define IMG_CHAR_UNDERSCORE                            661
-#define IMG_CHAR_COPYRIGHT                             662
-#define IMG_CHAR_AUMLAUT                               663
-#define IMG_CHAR_OUMLAUT                               664
-#define IMG_CHAR_UUMLAUT                               665
-#define IMG_CHAR_DEGREE                                        666
-#define IMG_CHAR_TRADEMARK                             667
-#define IMG_CHAR_CURSOR                                        668
-#define IMG_CUSTOM_1                                   669
-#define IMG_CUSTOM_2                                   670
-#define IMG_CUSTOM_3                                   671
-#define IMG_CUSTOM_4                                   672
-#define IMG_CUSTOM_5                                   673
-#define IMG_CUSTOM_6                                   674
-#define IMG_CUSTOM_7                                   675
-#define IMG_CUSTOM_8                                   676
-#define IMG_CUSTOM_9                                   677
-#define IMG_CUSTOM_10                                  678
-#define IMG_CUSTOM_11                                  679
-#define IMG_CUSTOM_12                                  680
-#define IMG_CUSTOM_13                                  681
-#define IMG_CUSTOM_14                                  682
-#define IMG_CUSTOM_15                                  683
-#define IMG_CUSTOM_16                                  684
-#define IMG_CUSTOM_17                                  685
-#define IMG_CUSTOM_18                                  686
-#define IMG_CUSTOM_19                                  687
-#define IMG_CUSTOM_20                                  688
-#define IMG_CUSTOM_21                                  689
-#define IMG_CUSTOM_22                                  690
-#define IMG_CUSTOM_23                                  691
-#define IMG_CUSTOM_24                                  692
-#define IMG_CUSTOM_25                                  693
-#define IMG_CUSTOM_26                                  694
-#define IMG_CUSTOM_27                                  695
-#define IMG_CUSTOM_28                                  696
-#define IMG_CUSTOM_29                                  697
-#define IMG_CUSTOM_30                                  698
-#define IMG_CUSTOM_31                                  699
-#define IMG_CUSTOM_32                                  700
-#define IMG_CUSTOM_33                                  701
-#define IMG_CUSTOM_34                                  702
-#define IMG_CUSTOM_35                                  703
-#define IMG_CUSTOM_36                                  704
-#define IMG_CUSTOM_37                                  705
-#define IMG_CUSTOM_38                                  706
-#define IMG_CUSTOM_39                                  707
-#define IMG_CUSTOM_40                                  708
-#define IMG_CUSTOM_41                                  709
-#define IMG_CUSTOM_42                                  710
-#define IMG_CUSTOM_43                                  711
-#define IMG_CUSTOM_44                                  712
-#define IMG_CUSTOM_45                                  713
-#define IMG_CUSTOM_46                                  714
-#define IMG_CUSTOM_47                                  715
-#define IMG_CUSTOM_48                                  716
-#define IMG_CUSTOM_49                                  717
-#define IMG_CUSTOM_50                                  718
-#define IMG_CUSTOM_51                                  719
-#define IMG_CUSTOM_52                                  720
-#define IMG_CUSTOM_53                                  721
-#define IMG_CUSTOM_54                                  722
-#define IMG_CUSTOM_55                                  723
-#define IMG_CUSTOM_56                                  724
-#define IMG_CUSTOM_57                                  725
-#define IMG_CUSTOM_58                                  726
-#define IMG_CUSTOM_59                                  727
-#define IMG_CUSTOM_60                                  728
-#define IMG_CUSTOM_61                                  729
-#define IMG_CUSTOM_62                                  730
-#define IMG_CUSTOM_63                                  731
-#define IMG_CUSTOM_64                                  732
-#define IMG_CUSTOM_65                                  733
-#define IMG_CUSTOM_66                                  734
-#define IMG_CUSTOM_67                                  735
-#define IMG_CUSTOM_68                                  736
-#define IMG_CUSTOM_69                                  737
-#define IMG_CUSTOM_70                                  738
-#define IMG_CUSTOM_71                                  739
-#define IMG_CUSTOM_72                                  740
-#define IMG_CUSTOM_73                                  741
-#define IMG_CUSTOM_74                                  742
-#define IMG_CUSTOM_75                                  743
-#define IMG_CUSTOM_76                                  744
-#define IMG_CUSTOM_77                                  745
-#define IMG_CUSTOM_78                                  746
-#define IMG_CUSTOM_79                                  747
-#define IMG_CUSTOM_80                                  748
-#define IMG_CUSTOM_81                                  749
-#define IMG_CUSTOM_82                                  750
-#define IMG_CUSTOM_83                                  751
-#define IMG_CUSTOM_84                                  752
-#define IMG_CUSTOM_85                                  753
-#define IMG_CUSTOM_86                                  754
-#define IMG_CUSTOM_87                                  755
-#define IMG_CUSTOM_88                                  756
-#define IMG_CUSTOM_89                                  757
-#define IMG_CUSTOM_90                                  758
-#define IMG_CUSTOM_91                                  759
-#define IMG_CUSTOM_92                                  760
-#define IMG_CUSTOM_93                                  761
-#define IMG_CUSTOM_94                                  762
-#define IMG_CUSTOM_95                                  763
-#define IMG_CUSTOM_96                                  764
-#define IMG_CUSTOM_97                                  765
-#define IMG_CUSTOM_98                                  766
-#define IMG_CUSTOM_99                                  767
-#define IMG_CUSTOM_100                                 768
-#define IMG_CUSTOM_101                                 769
-#define IMG_CUSTOM_102                                 770
-#define IMG_CUSTOM_103                                 771
-#define IMG_CUSTOM_104                                 772
-#define IMG_CUSTOM_105                                 773
-#define IMG_CUSTOM_106                                 774
-#define IMG_CUSTOM_107                                 775
-#define IMG_CUSTOM_108                                 776
-#define IMG_CUSTOM_109                                 777
-#define IMG_CUSTOM_110                                 778
-#define IMG_CUSTOM_111                                 779
-#define IMG_CUSTOM_112                                 780
-#define IMG_CUSTOM_113                                 781
-#define IMG_CUSTOM_114                                 782
-#define IMG_CUSTOM_115                                 783
-#define IMG_CUSTOM_116                                 784
-#define IMG_CUSTOM_117                                 785
-#define IMG_CUSTOM_118                                 786
-#define IMG_CUSTOM_119                                 787
-#define IMG_CUSTOM_120                                 788
-#define IMG_CUSTOM_121                                 789
-#define IMG_CUSTOM_122                                 790
-#define IMG_CUSTOM_123                                 791
-#define IMG_CUSTOM_124                                 792
-#define IMG_CUSTOM_125                                 793
-#define IMG_CUSTOM_126                                 794
-#define IMG_CUSTOM_127                                 795
-#define IMG_CUSTOM_128                                 796
-#define IMG_TOON_1                                     797
-#define IMG_TOON_2                                     798
-#define IMG_TOON_3                                     799
-#define IMG_TOON_4                                     800
-#define IMG_TOON_5                                     801
-#define IMG_TOON_6                                     802
-#define IMG_TOON_7                                     803
-#define IMG_TOON_8                                     804
-#define IMG_TOON_9                                     805
-#define IMG_TOON_10                                    806
-#define IMG_TOON_11                                    807
-#define IMG_TOON_12                                    808
-#define IMG_TOON_13                                    809
-#define IMG_TOON_14                                    810
-#define IMG_TOON_15                                    811
-#define IMG_TOON_16                                    812
-#define IMG_TOON_17                                    813
-#define IMG_TOON_18                                    814
-#define IMG_TOON_19                                    815
-#define IMG_TOON_20                                    816
-#define IMG_MENU_CALIBRATE_RED                         817
-#define IMG_MENU_CALIBRATE_BLUE                                818
-#define IMG_MENU_CALIBRATE_YELLOW                      819
-#define IMG_MENU_BUTTON                                        820
-#define IMG_MENU_BUTTON_ACTIVE                         821
-#define IMG_MENU_BUTTON_LEFT                           822
-#define IMG_MENU_BUTTON_RIGHT                          823
-#define IMG_MENU_BUTTON_UP                             824
-#define IMG_MENU_BUTTON_DOWN                           825
-#define IMG_MENU_BUTTON_LEFT_ACTIVE                    826
-#define IMG_MENU_BUTTON_RIGHT_ACTIVE                   827
-#define IMG_MENU_BUTTON_UP_ACTIVE                      828
-#define IMG_MENU_BUTTON_DOWN_ACTIVE                    829
-#define IMG_MENU_SCROLLBAR                             830
-#define IMG_MENU_SCROLLBAR_ACTIVE                      831
-#define IMG_FONT_INITIAL_1                             832
-#define IMG_FONT_INITIAL_2                             833
-#define IMG_FONT_INITIAL_3                             834
-#define IMG_FONT_INITIAL_4                             835
-#define IMG_FONT_TITLE_1                               836
-#define IMG_FONT_TITLE_1_LEVELS                                837
-#define IMG_FONT_TITLE_2                               838
-#define IMG_FONT_MENU_1                                        839
-#define IMG_FONT_MENU_2                                        840
-#define IMG_FONT_TEXT_1                                        841
-#define IMG_FONT_TEXT_1_LEVELS                         842
-#define IMG_FONT_TEXT_1_SCORES                         843
-#define IMG_FONT_TEXT_1_PREVIEW                                844
-#define IMG_FONT_TEXT_2                                        845
-#define IMG_FONT_TEXT_2_LEVELS                         846
-#define IMG_FONT_TEXT_2_SCORES                         847
-#define IMG_FONT_TEXT_2_PREVIEW                                848
-#define IMG_FONT_TEXT_3                                        849
-#define IMG_FONT_TEXT_3_LEVELS                         850
-#define IMG_FONT_TEXT_3_SCORES                         851
-#define IMG_FONT_TEXT_3_PREVIEW                                852
-#define IMG_FONT_TEXT_4                                        853
-#define IMG_FONT_TEXT_4_LEVELS                         854
-#define IMG_FONT_TEXT_4_SCORES                         855
-#define IMG_FONT_INPUT_1                               856
-#define IMG_FONT_INPUT_1_MAIN                          857
-#define IMG_FONT_INPUT_1_ACTIVE                                858
-#define IMG_FONT_INPUT_1_ACTIVE_MAIN                   859
-#define IMG_FONT_INPUT_1_ACTIVE_SETUP                  860
-#define IMG_FONT_INPUT_2                               861
-#define IMG_FONT_INPUT_2_ACTIVE                                862
-#define IMG_FONT_OPTION_OFF                            863
-#define IMG_FONT_OPTION_ON                             864
-#define IMG_FONT_VALUE_1                               865
-#define IMG_FONT_VALUE_2                               866
-#define IMG_FONT_VALUE_OLD                             867
-#define IMG_FONT_LEVEL_NUMBER                          868
-#define IMG_FONT_TAPE_RECORDER                         869
-#define IMG_FONT_GAME_INFO                             870
-#define IMG_GLOBAL_BORDER                              871
-#define IMG_GLOBAL_DOOR                                        872
-#define IMG_EDITOR_ELEMENT_BORDER                      873
-#define IMG_BACKGROUND                                 874
-#define IMG_BACKGROUND_MAIN                            875
-#define IMG_BACKGROUND_LEVELS                          876
-#define IMG_BACKGROUND_SCORES                          877
-#define IMG_BACKGROUND_EDITOR                          878
-#define IMG_BACKGROUND_INFO                            879
-#define IMG_BACKGROUND_SETUP                           880
-#define IMG_BACKGROUND_DOOR                            881
+#define IMG_EM_GATE_1                                  193
+#define IMG_EM_GATE_2                                  194
+#define IMG_EM_GATE_3                                  195
+#define IMG_EM_GATE_4                                  196
+#define IMG_EM_GATE_1_GRAY                             197
+#define IMG_EM_GATE_1_GRAY_EDITOR                      198
+#define IMG_EM_GATE_2_GRAY                             199
+#define IMG_EM_GATE_2_GRAY_EDITOR                      200
+#define IMG_EM_GATE_3_GRAY                             201
+#define IMG_EM_GATE_3_GRAY_EDITOR                      202
+#define IMG_EM_GATE_4_GRAY                             203
+#define IMG_EM_GATE_4_GRAY_EDITOR                      204
+#define IMG_EXIT_CLOSED                                        205
+#define IMG_EXIT_OPENING                               206
+#define IMG_EXIT_OPEN                                  207
+#define IMG_BALLOON                                    208
+#define IMG_BALLOON_MOVING                             209
+#define IMG_BALLOON_SWITCH_LEFT                                210
+#define IMG_BALLOON_SWITCH_RIGHT                       211
+#define IMG_BALLOON_SWITCH_UP                          212
+#define IMG_BALLOON_SWITCH_DOWN                                213
+#define IMG_BALLOON_SWITCH_ANY                         214
+#define IMG_SPRING                                     215
+#define IMG_SPRING_MOVING                              216
+#define IMG_EMC_STEELWALL_1                            217
+#define IMG_EMC_STEELWALL_2                            218
+#define IMG_EMC_STEELWALL_3                            219
+#define IMG_EMC_STEELWALL_4                            220
+#define IMG_EMC_WALL_1                                 221
+#define IMG_EMC_WALL_2                                 222
+#define IMG_EMC_WALL_3                                 223
+#define IMG_EMC_WALL_4                                 224
+#define IMG_EMC_WALL_5                                 225
+#define IMG_EMC_WALL_6                                 226
+#define IMG_EMC_WALL_7                                 227
+#define IMG_EMC_WALL_8                                 228
+#define IMG_INVISIBLE_STEELWALL                                229
+#define IMG_INVISIBLE_STEELWALL_EDITOR                 230
+#define IMG_INVISIBLE_STEELWALL_ACTIVE                 231
+#define IMG_INVISIBLE_WALL                             232
+#define IMG_INVISIBLE_WALL_EDITOR                      233
+#define IMG_INVISIBLE_WALL_ACTIVE                      234
+#define IMG_INVISIBLE_SAND                             235
+#define IMG_INVISIBLE_SAND_EDITOR                      236
+#define IMG_INVISIBLE_SAND_ACTIVE                      237
+#define IMG_CONVEYOR_BELT_1_MIDDLE                     238
+#define IMG_CONVEYOR_BELT_1_MIDDLE_ACTIVE              239
+#define IMG_CONVEYOR_BELT_1_LEFT                       240
+#define IMG_CONVEYOR_BELT_1_LEFT_ACTIVE                        241
+#define IMG_CONVEYOR_BELT_1_RIGHT                      242
+#define IMG_CONVEYOR_BELT_1_RIGHT_ACTIVE               243
+#define IMG_CONVEYOR_BELT_1_SWITCH_LEFT                        244
+#define IMG_CONVEYOR_BELT_1_SWITCH_MIDDLE              245
+#define IMG_CONVEYOR_BELT_1_SWITCH_RIGHT               246
+#define IMG_CONVEYOR_BELT_2_MIDDLE                     247
+#define IMG_CONVEYOR_BELT_2_MIDDLE_ACTIVE              248
+#define IMG_CONVEYOR_BELT_2_LEFT                       249
+#define IMG_CONVEYOR_BELT_2_LEFT_ACTIVE                        250
+#define IMG_CONVEYOR_BELT_2_RIGHT                      251
+#define IMG_CONVEYOR_BELT_2_RIGHT_ACTIVE               252
+#define IMG_CONVEYOR_BELT_2_SWITCH_LEFT                        253
+#define IMG_CONVEYOR_BELT_2_SWITCH_MIDDLE              254
+#define IMG_CONVEYOR_BELT_2_SWITCH_RIGHT               255
+#define IMG_CONVEYOR_BELT_3_MIDDLE                     256
+#define IMG_CONVEYOR_BELT_3_MIDDLE_ACTIVE              257
+#define IMG_CONVEYOR_BELT_3_LEFT                       258
+#define IMG_CONVEYOR_BELT_3_LEFT_ACTIVE                        259
+#define IMG_CONVEYOR_BELT_3_RIGHT                      260
+#define IMG_CONVEYOR_BELT_3_RIGHT_ACTIVE               261
+#define IMG_CONVEYOR_BELT_3_SWITCH_LEFT                        262
+#define IMG_CONVEYOR_BELT_3_SWITCH_MIDDLE              263
+#define IMG_CONVEYOR_BELT_3_SWITCH_RIGHT               264
+#define IMG_CONVEYOR_BELT_4_MIDDLE                     265
+#define IMG_CONVEYOR_BELT_4_MIDDLE_ACTIVE              266
+#define IMG_CONVEYOR_BELT_4_LEFT                       267
+#define IMG_CONVEYOR_BELT_4_LEFT_ACTIVE                        268
+#define IMG_CONVEYOR_BELT_4_RIGHT                      269
+#define IMG_CONVEYOR_BELT_4_RIGHT_ACTIVE               270
+#define IMG_CONVEYOR_BELT_4_SWITCH_LEFT                        271
+#define IMG_CONVEYOR_BELT_4_SWITCH_MIDDLE              272
+#define IMG_CONVEYOR_BELT_4_SWITCH_RIGHT               273
+#define IMG_SWITCHGATE_SWITCH_UP                       274
+#define IMG_SWITCHGATE_SWITCH_DOWN                     275
+#define IMG_LIGHT_SWITCH                               276
+#define IMG_LIGHT_SWITCH_ACTIVE                                277
+#define IMG_TIMEGATE_SWITCH                            278
+#define IMG_TIMEGATE_SWITCH_ACTIVE                     279
+#define IMG_ENVELOPE                                   280
+#define IMG_SIGN_EXCLAMATION                           281
+#define IMG_SIGN_STOP                                  282
+#define IMG_LANDMINE                                   283
+#define IMG_STEELWALL_SLANTED                          284
+#define IMG_EXTRA_TIME                                 285
+#define IMG_SHIELD_NORMAL                              286
+#define IMG_SHIELD_NORMAL_ACTIVE                       287
+#define IMG_SHIELD_DEADLY                              288
+#define IMG_SHIELD_DEADLY_ACTIVE                       289
+#define IMG_SWITCHGATE_CLOSED                          290
+#define IMG_SWITCHGATE_OPENING                         291
+#define IMG_SWITCHGATE_OPEN                            292
+#define IMG_SWITCHGATE_CLOSING                         293
+#define IMG_TIMEGATE_CLOSED                            294
+#define IMG_TIMEGATE_OPENING                           295
+#define IMG_TIMEGATE_OPEN                              296
+#define IMG_TIMEGATE_CLOSING                           297
+#define IMG_PEARL                                      298
+#define IMG_PEARL_BREAKING                             299
+#define IMG_CRYSTAL                                    300
+#define IMG_WALL_PEARL                                 301
+#define IMG_WALL_CRYSTAL                               302
+#define IMG_TUBE_RIGHT_DOWN                            303
+#define IMG_TUBE_HORIZONTAL_DOWN                       304
+#define IMG_TUBE_LEFT_DOWN                             305
+#define IMG_TUBE_HORIZONTAL                            306
+#define IMG_TUBE_VERTICAL_RIGHT                                307
+#define IMG_TUBE_ANY                                   308
+#define IMG_TUBE_VERTICAL_LEFT                         309
+#define IMG_TUBE_VERTICAL                              310
+#define IMG_TUBE_RIGHT_UP                              311
+#define IMG_TUBE_HORIZONTAL_UP                         312
+#define IMG_TUBE_LEFT_UP                               313
+#define IMG_TRAP                                       314
+#define IMG_TRAP_ACTIVE                                        315
+#define IMG_DX_SUPABOMB                                        316
+#define IMG_KEY_1                                      317
+#define IMG_KEY_1_EDITOR                               318
+#define IMG_KEY_2                                      319
+#define IMG_KEY_2_EDITOR                               320
+#define IMG_KEY_3                                      321
+#define IMG_KEY_3_EDITOR                               322
+#define IMG_KEY_4                                      323
+#define IMG_KEY_4_EDITOR                               324
+#define IMG_GATE_1                                     325
+#define IMG_GATE_2                                     326
+#define IMG_GATE_3                                     327
+#define IMG_GATE_4                                     328
+#define IMG_GATE_1_GRAY                                        329
+#define IMG_GATE_1_GRAY_EDITOR                         330
+#define IMG_GATE_2_GRAY                                        331
+#define IMG_GATE_2_GRAY_EDITOR                         332
+#define IMG_GATE_3_GRAY                                        333
+#define IMG_GATE_3_GRAY_EDITOR                         334
+#define IMG_GATE_4_GRAY                                        335
+#define IMG_GATE_4_GRAY_EDITOR                         336
+#define IMG_GAME_OF_LIFE                               337
+#define IMG_BIOMAZE                                    338
+#define IMG_PACMAN_RIGHT                               339
+#define IMG_PACMAN_UP                                  340
+#define IMG_PACMAN_LEFT                                        341
+#define IMG_PACMAN_DOWN                                        342
+#define IMG_LAMP                                       343
+#define IMG_LAMP_EDITOR                                        344
+#define IMG_LAMP_ACTIVE                                        345
+#define IMG_TIME_ORB_FULL                              346
+#define IMG_TIME_ORB_EMPTY                             347
+#define IMG_EMERALD_YELLOW                             348
+#define IMG_EMERALD_YELLOW_MOVING                      349
+#define IMG_EMERALD_YELLOW_FALLING                     350
+#define IMG_EMERALD_RED                                        351
+#define IMG_EMERALD_RED_MOVING                         352
+#define IMG_EMERALD_RED_FALLING                                353
+#define IMG_EMERALD_PURPLE                             354
+#define IMG_EMERALD_PURPLE_MOVING                      355
+#define IMG_EMERALD_PURPLE_FALLING                     356
+#define IMG_WALL_EMERALD_YELLOW                                357
+#define IMG_WALL_EMERALD_RED                           358
+#define IMG_WALL_EMERALD_PURPLE                                359
+#define IMG_WALL_BD_DIAMOND                            360
+#define IMG_EXPANDABLE_WALL                            361
+#define IMG_EXPANDABLE_WALL_HORIZONTAL                 362
+#define IMG_EXPANDABLE_WALL_HORIZONTAL_EDITOR          363
+#define IMG_EXPANDABLE_WALL_VERTICAL                   364
+#define IMG_EXPANDABLE_WALL_VERTICAL_EDITOR            365
+#define IMG_EXPANDABLE_WALL_ANY                                366
+#define IMG_EXPANDABLE_WALL_ANY_EDITOR                 367
+#define IMG_EXPANDABLE_WALL_GROWING_LEFT               368
+#define IMG_EXPANDABLE_WALL_GROWING_RIGHT              369
+#define IMG_EXPANDABLE_WALL_GROWING_UP                 370
+#define IMG_EXPANDABLE_WALL_GROWING_DOWN               371
+#define IMG_BLACK_ORB                                  372
+#define IMG_SPEED_PILL                                 373
+#define IMG_DARK_YAMYAM                                        374
+#define IMG_DYNABOMB_ACTIVE                            375
+#define IMG_DYNABOMB_PLAYER_1_ACTIVE                   376
+#define IMG_DYNABOMB_PLAYER_2_ACTIVE                   377
+#define IMG_DYNABOMB_PLAYER_3_ACTIVE                   378
+#define IMG_DYNABOMB_PLAYER_4_ACTIVE                   379
+#define IMG_DYNABOMB_INCREASE_NUMBER                   380
+#define IMG_DYNABOMB_INCREASE_SIZE                     381
+#define IMG_DYNABOMB_INCREASE_POWER                    382
+#define IMG_PIG                                                383
+#define IMG_PIG_DOWN                                   384
+#define IMG_PIG_UP                                     385
+#define IMG_PIG_LEFT                                   386
+#define IMG_PIG_RIGHT                                  387
+#define IMG_PIG_MOVING_DOWN                            388
+#define IMG_PIG_MOVING_UP                              389
+#define IMG_PIG_MOVING_LEFT                            390
+#define IMG_PIG_MOVING_RIGHT                           391
+#define IMG_PIG_DIGGING_DOWN                           392
+#define IMG_PIG_DIGGING_UP                             393
+#define IMG_PIG_DIGGING_LEFT                           394
+#define IMG_PIG_DIGGING_RIGHT                          395
+#define IMG_DRAGON                                     396
+#define IMG_DRAGON_DOWN                                        397
+#define IMG_DRAGON_UP                                  398
+#define IMG_DRAGON_LEFT                                        399
+#define IMG_DRAGON_RIGHT                               400
+#define IMG_DRAGON_MOVING_DOWN                         401
+#define IMG_DRAGON_MOVING_UP                           402
+#define IMG_DRAGON_MOVING_LEFT                         403
+#define IMG_DRAGON_MOVING_RIGHT                                404
+#define IMG_DRAGON_ATTACKING_DOWN                      405
+#define IMG_DRAGON_ATTACKING_UP                                406
+#define IMG_DRAGON_ATTACKING_LEFT                      407
+#define IMG_DRAGON_ATTACKING_RIGHT                     408
+#define IMG_MOLE                                       409
+#define IMG_MOLE_DOWN                                  410
+#define IMG_MOLE_UP                                    411
+#define IMG_MOLE_LEFT                                  412
+#define IMG_MOLE_RIGHT                                 413
+#define IMG_MOLE_MOVING_DOWN                           414
+#define IMG_MOLE_MOVING_UP                             415
+#define IMG_MOLE_MOVING_LEFT                           416
+#define IMG_MOLE_MOVING_RIGHT                          417
+#define IMG_MOLE_DIGGING_DOWN                          418
+#define IMG_MOLE_DIGGING_UP                            419
+#define IMG_MOLE_DIGGING_LEFT                          420
+#define IMG_MOLE_DIGGING_RIGHT                         421
+#define IMG_PENGUIN                                    422
+#define IMG_PENGUIN_EDITOR                             423
+#define IMG_PENGUIN_DOWN                               424
+#define IMG_PENGUIN_UP                                 425
+#define IMG_PENGUIN_LEFT                               426
+#define IMG_PENGUIN_RIGHT                              427
+#define IMG_PENGUIN_MOVING_DOWN                                428
+#define IMG_PENGUIN_MOVING_UP                          429
+#define IMG_PENGUIN_MOVING_LEFT                                430
+#define IMG_PENGUIN_MOVING_RIGHT                       431
+#define IMG_SATELLITE                                  432
+#define IMG_SATELLITE_MOVING                           433
+#define IMG_FLAMES_1_LEFT                              434
+#define IMG_FLAMES_2_LEFT                              435
+#define IMG_FLAMES_3_LEFT                              436
+#define IMG_FLAMES_1_RIGHT                             437
+#define IMG_FLAMES_2_RIGHT                             438
+#define IMG_FLAMES_3_RIGHT                             439
+#define IMG_FLAMES_1_UP                                        440
+#define IMG_FLAMES_2_UP                                        441
+#define IMG_FLAMES_3_UP                                        442
+#define IMG_FLAMES_1_DOWN                              443
+#define IMG_FLAMES_2_DOWN                              444
+#define IMG_FLAMES_3_DOWN                              445
+#define IMG_STONEBLOCK                                 446
+#define IMG_PLAYER_1                                   447
+#define IMG_PLAYER_1_EDITOR                            448
+#define IMG_PLAYER_1_DOWN                              449
+#define IMG_PLAYER_1_UP                                        450
+#define IMG_PLAYER_1_LEFT                              451
+#define IMG_PLAYER_1_RIGHT                             452
+#define IMG_PLAYER_1_MOVING_DOWN                       453
+#define IMG_PLAYER_1_MOVING_UP                         454
+#define IMG_PLAYER_1_MOVING_LEFT                       455
+#define IMG_PLAYER_1_MOVING_RIGHT                      456
+#define IMG_PLAYER_1_DIGGING_DOWN                      457
+#define IMG_PLAYER_1_DIGGING_UP                                458
+#define IMG_PLAYER_1_DIGGING_LEFT                      459
+#define IMG_PLAYER_1_DIGGING_RIGHT                     460
+#define IMG_PLAYER_1_COLLECTING_DOWN                   461
+#define IMG_PLAYER_1_COLLECTING_UP                     462
+#define IMG_PLAYER_1_COLLECTING_LEFT                   463
+#define IMG_PLAYER_1_COLLECTING_RIGHT                  464
+#define IMG_PLAYER_1_PUSHING_DOWN                      465
+#define IMG_PLAYER_1_PUSHING_UP                                466
+#define IMG_PLAYER_1_PUSHING_LEFT                      467
+#define IMG_PLAYER_1_PUSHING_RIGHT                     468
+#define IMG_PLAYER_1_SNAPPING_DOWN                     469
+#define IMG_PLAYER_1_SNAPPING_UP                       470
+#define IMG_PLAYER_1_SNAPPING_LEFT                     471
+#define IMG_PLAYER_1_SNAPPING_RIGHT                    472
+#define IMG_PLAYER_2                                   473
+#define IMG_PLAYER_2_EDITOR                            474
+#define IMG_PLAYER_2_DOWN                              475
+#define IMG_PLAYER_2_UP                                        476
+#define IMG_PLAYER_2_LEFT                              477
+#define IMG_PLAYER_2_RIGHT                             478
+#define IMG_PLAYER_2_MOVING_DOWN                       479
+#define IMG_PLAYER_2_MOVING_UP                         480
+#define IMG_PLAYER_2_MOVING_LEFT                       481
+#define IMG_PLAYER_2_MOVING_RIGHT                      482
+#define IMG_PLAYER_2_DIGGING_DOWN                      483
+#define IMG_PLAYER_2_DIGGING_UP                                484
+#define IMG_PLAYER_2_DIGGING_LEFT                      485
+#define IMG_PLAYER_2_DIGGING_RIGHT                     486
+#define IMG_PLAYER_2_COLLECTING_DOWN                   487
+#define IMG_PLAYER_2_COLLECTING_UP                     488
+#define IMG_PLAYER_2_COLLECTING_LEFT                   489
+#define IMG_PLAYER_2_COLLECTING_RIGHT                  490
+#define IMG_PLAYER_2_PUSHING_DOWN                      491
+#define IMG_PLAYER_2_PUSHING_UP                                492
+#define IMG_PLAYER_2_PUSHING_LEFT                      493
+#define IMG_PLAYER_2_PUSHING_RIGHT                     494
+#define IMG_PLAYER_2_SNAPPING_DOWN                     495
+#define IMG_PLAYER_2_SNAPPING_UP                       496
+#define IMG_PLAYER_2_SNAPPING_LEFT                     497
+#define IMG_PLAYER_2_SNAPPING_RIGHT                    498
+#define IMG_PLAYER_3                                   499
+#define IMG_PLAYER_3_EDITOR                            500
+#define IMG_PLAYER_3_DOWN                              501
+#define IMG_PLAYER_3_UP                                        502
+#define IMG_PLAYER_3_LEFT                              503
+#define IMG_PLAYER_3_RIGHT                             504
+#define IMG_PLAYER_3_MOVING_DOWN                       505
+#define IMG_PLAYER_3_MOVING_UP                         506
+#define IMG_PLAYER_3_MOVING_LEFT                       507
+#define IMG_PLAYER_3_MOVING_RIGHT                      508
+#define IMG_PLAYER_3_DIGGING_DOWN                      509
+#define IMG_PLAYER_3_DIGGING_UP                                510
+#define IMG_PLAYER_3_DIGGING_LEFT                      511
+#define IMG_PLAYER_3_DIGGING_RIGHT                     512
+#define IMG_PLAYER_3_COLLECTING_DOWN                   513
+#define IMG_PLAYER_3_COLLECTING_UP                     514
+#define IMG_PLAYER_3_COLLECTING_LEFT                   515
+#define IMG_PLAYER_3_COLLECTING_RIGHT                  516
+#define IMG_PLAYER_3_PUSHING_DOWN                      517
+#define IMG_PLAYER_3_PUSHING_UP                                518
+#define IMG_PLAYER_3_PUSHING_LEFT                      519
+#define IMG_PLAYER_3_PUSHING_RIGHT                     520
+#define IMG_PLAYER_3_SNAPPING_DOWN                     521
+#define IMG_PLAYER_3_SNAPPING_UP                       522
+#define IMG_PLAYER_3_SNAPPING_LEFT                     523
+#define IMG_PLAYER_3_SNAPPING_RIGHT                    524
+#define IMG_PLAYER_4                                   525
+#define IMG_PLAYER_4_EDITOR                            526
+#define IMG_PLAYER_4_DOWN                              527
+#define IMG_PLAYER_4_UP                                        528
+#define IMG_PLAYER_4_LEFT                              529
+#define IMG_PLAYER_4_RIGHT                             530
+#define IMG_PLAYER_4_MOVING_DOWN                       531
+#define IMG_PLAYER_4_MOVING_UP                         532
+#define IMG_PLAYER_4_MOVING_LEFT                       533
+#define IMG_PLAYER_4_MOVING_RIGHT                      534
+#define IMG_PLAYER_4_DIGGING_DOWN                      535
+#define IMG_PLAYER_4_DIGGING_UP                                536
+#define IMG_PLAYER_4_DIGGING_LEFT                      537
+#define IMG_PLAYER_4_DIGGING_RIGHT                     538
+#define IMG_PLAYER_4_COLLECTING_DOWN                   539
+#define IMG_PLAYER_4_COLLECTING_UP                     540
+#define IMG_PLAYER_4_COLLECTING_LEFT                   541
+#define IMG_PLAYER_4_COLLECTING_RIGHT                  542
+#define IMG_PLAYER_4_PUSHING_DOWN                      543
+#define IMG_PLAYER_4_PUSHING_UP                                544
+#define IMG_PLAYER_4_PUSHING_LEFT                      545
+#define IMG_PLAYER_4_PUSHING_RIGHT                     546
+#define IMG_PLAYER_4_SNAPPING_DOWN                     547
+#define IMG_PLAYER_4_SNAPPING_UP                       548
+#define IMG_PLAYER_4_SNAPPING_LEFT                     549
+#define IMG_PLAYER_4_SNAPPING_RIGHT                    550
+#define IMG_EXPLOSION                                  551
+#define IMG_TWINKLE_BLUE                               552
+#define IMG_TWINKLE_WHITE                              553
+#define IMG_STEELWALL_TOPLEFT                          554
+#define IMG_STEELWALL_TOPRIGHT                         555
+#define IMG_STEELWALL_BOTTOMLEFT                       556
+#define IMG_STEELWALL_BOTTOMRIGHT                      557
+#define IMG_STEELWALL_HORIZONTAL                       558
+#define IMG_STEELWALL_VERTICAL                         559
+#define IMG_STEELWALL_TOPLEFT_EDITOR                   560
+#define IMG_STEELWALL_TOPRIGHT_EDITOR                  561
+#define IMG_STEELWALL_BOTTOMLEFT_EDITOR                        562
+#define IMG_STEELWALL_BOTTOMRIGHT_EDITOR               563
+#define IMG_STEELWALL_HORIZONTAL_EDITOR                        564
+#define IMG_STEELWALL_VERTICAL_EDITOR                  565
+#define IMG_INVISIBLE_STEELWALL_TOPLEFT                        566
+#define IMG_INVISIBLE_STEELWALL_TOPRIGHT               567
+#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT             568
+#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT            569
+#define IMG_INVISIBLE_STEELWALL_HORIZONTAL             570
+#define IMG_INVISIBLE_STEELWALL_VERTICAL               571
+#define IMG_INVISIBLE_STEELWALL_TOPLEFT_EDITOR         572
+#define IMG_INVISIBLE_STEELWALL_TOPRIGHT_EDITOR                573
+#define IMG_INVISIBLE_STEELWALL_BOTTOMLEFT_EDITOR      574
+#define IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT_EDITOR     575
+#define IMG_INVISIBLE_STEELWALL_HORIZONTAL_EDITOR      576
+#define IMG_INVISIBLE_STEELWALL_VERTICAL_EDITOR                577
+#define IMG_ARROW_LEFT                                 578
+#define IMG_ARROW_RIGHT                                        579
+#define IMG_ARROW_UP                                   580
+#define IMG_ARROW_DOWN                                 581
+#define IMG_CHAR_SPACE                                 582
+#define IMG_CHAR_EXCLAM                                        583
+#define IMG_CHAR_QUOTEDBL                              584
+#define IMG_CHAR_NUMBERSIGN                            585
+#define IMG_CHAR_DOLLAR                                        586
+#define IMG_CHAR_PROCENT                               587
+#define IMG_CHAR_AMPERSAND                             588
+#define IMG_CHAR_APOSTROPHE                            589
+#define IMG_CHAR_PARENLEFT                             590
+#define IMG_CHAR_PARENRIGHT                            591
+#define IMG_CHAR_ASTERISK                              592
+#define IMG_CHAR_PLUS                                  593
+#define IMG_CHAR_COMMA                                 594
+#define IMG_CHAR_MINUS                                 595
+#define IMG_CHAR_PERIOD                                        596
+#define IMG_CHAR_SLASH                                 597
+#define IMG_CHAR_0                                     598
+#define IMG_CHAR_1                                     599
+#define IMG_CHAR_2                                     600
+#define IMG_CHAR_3                                     601
+#define IMG_CHAR_4                                     602
+#define IMG_CHAR_5                                     603
+#define IMG_CHAR_6                                     604
+#define IMG_CHAR_7                                     605
+#define IMG_CHAR_8                                     606
+#define IMG_CHAR_9                                     607
+#define IMG_CHAR_COLON                                 608
+#define IMG_CHAR_SEMICOLON                             609
+#define IMG_CHAR_LESS                                  610
+#define IMG_CHAR_EQUAL                                 611
+#define IMG_CHAR_GREATER                               612
+#define IMG_CHAR_QUESTION                              613
+#define IMG_CHAR_AT                                    614
+#define IMG_CHAR_A                                     615
+#define IMG_CHAR_B                                     616
+#define IMG_CHAR_C                                     617
+#define IMG_CHAR_D                                     618
+#define IMG_CHAR_E                                     619
+#define IMG_CHAR_F                                     620
+#define IMG_CHAR_G                                     621
+#define IMG_CHAR_H                                     622
+#define IMG_CHAR_I                                     623
+#define IMG_CHAR_J                                     624
+#define IMG_CHAR_K                                     625
+#define IMG_CHAR_L                                     626
+#define IMG_CHAR_M                                     627
+#define IMG_CHAR_N                                     628
+#define IMG_CHAR_O                                     629
+#define IMG_CHAR_P                                     630
+#define IMG_CHAR_Q                                     631
+#define IMG_CHAR_R                                     632
+#define IMG_CHAR_S                                     633
+#define IMG_CHAR_T                                     634
+#define IMG_CHAR_U                                     635
+#define IMG_CHAR_V                                     636
+#define IMG_CHAR_W                                     637
+#define IMG_CHAR_X                                     638
+#define IMG_CHAR_Y                                     639
+#define IMG_CHAR_Z                                     640
+#define IMG_CHAR_BRACKETLEFT                           641
+#define IMG_CHAR_BACKSLASH                             642
+#define IMG_CHAR_BRACKETRIGHT                          643
+#define IMG_CHAR_ASCIICIRCUM                           644
+#define IMG_CHAR_UNDERSCORE                            645
+#define IMG_CHAR_COPYRIGHT                             646
+#define IMG_CHAR_AUMLAUT                               647
+#define IMG_CHAR_OUMLAUT                               648
+#define IMG_CHAR_UUMLAUT                               649
+#define IMG_CHAR_DEGREE                                        650
+#define IMG_CHAR_TRADEMARK                             651
+#define IMG_CHAR_CURSOR                                        652
+#define IMG_CUSTOM_1                                   653
+#define IMG_CUSTOM_2                                   654
+#define IMG_CUSTOM_3                                   655
+#define IMG_CUSTOM_4                                   656
+#define IMG_CUSTOM_5                                   657
+#define IMG_CUSTOM_6                                   658
+#define IMG_CUSTOM_7                                   659
+#define IMG_CUSTOM_8                                   660
+#define IMG_CUSTOM_9                                   661
+#define IMG_CUSTOM_10                                  662
+#define IMG_CUSTOM_11                                  663
+#define IMG_CUSTOM_12                                  664
+#define IMG_CUSTOM_13                                  665
+#define IMG_CUSTOM_14                                  666
+#define IMG_CUSTOM_15                                  667
+#define IMG_CUSTOM_16                                  668
+#define IMG_CUSTOM_17                                  669
+#define IMG_CUSTOM_18                                  670
+#define IMG_CUSTOM_19                                  671
+#define IMG_CUSTOM_20                                  672
+#define IMG_CUSTOM_21                                  673
+#define IMG_CUSTOM_22                                  674
+#define IMG_CUSTOM_23                                  675
+#define IMG_CUSTOM_24                                  676
+#define IMG_CUSTOM_25                                  677
+#define IMG_CUSTOM_26                                  678
+#define IMG_CUSTOM_27                                  679
+#define IMG_CUSTOM_28                                  680
+#define IMG_CUSTOM_29                                  681
+#define IMG_CUSTOM_30                                  682
+#define IMG_CUSTOM_31                                  683
+#define IMG_CUSTOM_32                                  684
+#define IMG_CUSTOM_33                                  685
+#define IMG_CUSTOM_34                                  686
+#define IMG_CUSTOM_35                                  687
+#define IMG_CUSTOM_36                                  688
+#define IMG_CUSTOM_37                                  689
+#define IMG_CUSTOM_38                                  690
+#define IMG_CUSTOM_39                                  691
+#define IMG_CUSTOM_40                                  692
+#define IMG_CUSTOM_41                                  693
+#define IMG_CUSTOM_42                                  694
+#define IMG_CUSTOM_43                                  695
+#define IMG_CUSTOM_44                                  696
+#define IMG_CUSTOM_45                                  697
+#define IMG_CUSTOM_46                                  698
+#define IMG_CUSTOM_47                                  699
+#define IMG_CUSTOM_48                                  700
+#define IMG_CUSTOM_49                                  701
+#define IMG_CUSTOM_50                                  702
+#define IMG_CUSTOM_51                                  703
+#define IMG_CUSTOM_52                                  704
+#define IMG_CUSTOM_53                                  705
+#define IMG_CUSTOM_54                                  706
+#define IMG_CUSTOM_55                                  707
+#define IMG_CUSTOM_56                                  708
+#define IMG_CUSTOM_57                                  709
+#define IMG_CUSTOM_58                                  710
+#define IMG_CUSTOM_59                                  711
+#define IMG_CUSTOM_60                                  712
+#define IMG_CUSTOM_61                                  713
+#define IMG_CUSTOM_62                                  714
+#define IMG_CUSTOM_63                                  715
+#define IMG_CUSTOM_64                                  716
+#define IMG_CUSTOM_65                                  717
+#define IMG_CUSTOM_66                                  718
+#define IMG_CUSTOM_67                                  719
+#define IMG_CUSTOM_68                                  720
+#define IMG_CUSTOM_69                                  721
+#define IMG_CUSTOM_70                                  722
+#define IMG_CUSTOM_71                                  723
+#define IMG_CUSTOM_72                                  724
+#define IMG_CUSTOM_73                                  725
+#define IMG_CUSTOM_74                                  726
+#define IMG_CUSTOM_75                                  727
+#define IMG_CUSTOM_76                                  728
+#define IMG_CUSTOM_77                                  729
+#define IMG_CUSTOM_78                                  730
+#define IMG_CUSTOM_79                                  731
+#define IMG_CUSTOM_80                                  732
+#define IMG_CUSTOM_81                                  733
+#define IMG_CUSTOM_82                                  734
+#define IMG_CUSTOM_83                                  735
+#define IMG_CUSTOM_84                                  736
+#define IMG_CUSTOM_85                                  737
+#define IMG_CUSTOM_86                                  738
+#define IMG_CUSTOM_87                                  739
+#define IMG_CUSTOM_88                                  740
+#define IMG_CUSTOM_89                                  741
+#define IMG_CUSTOM_90                                  742
+#define IMG_CUSTOM_91                                  743
+#define IMG_CUSTOM_92                                  744
+#define IMG_CUSTOM_93                                  745
+#define IMG_CUSTOM_94                                  746
+#define IMG_CUSTOM_95                                  747
+#define IMG_CUSTOM_96                                  748
+#define IMG_CUSTOM_97                                  749
+#define IMG_CUSTOM_98                                  750
+#define IMG_CUSTOM_99                                  751
+#define IMG_CUSTOM_100                                 752
+#define IMG_CUSTOM_101                                 753
+#define IMG_CUSTOM_102                                 754
+#define IMG_CUSTOM_103                                 755
+#define IMG_CUSTOM_104                                 756
+#define IMG_CUSTOM_105                                 757
+#define IMG_CUSTOM_106                                 758
+#define IMG_CUSTOM_107                                 759
+#define IMG_CUSTOM_108                                 760
+#define IMG_CUSTOM_109                                 761
+#define IMG_CUSTOM_110                                 762
+#define IMG_CUSTOM_111                                 763
+#define IMG_CUSTOM_112                                 764
+#define IMG_CUSTOM_113                                 765
+#define IMG_CUSTOM_114                                 766
+#define IMG_CUSTOM_115                                 767
+#define IMG_CUSTOM_116                                 768
+#define IMG_CUSTOM_117                                 769
+#define IMG_CUSTOM_118                                 770
+#define IMG_CUSTOM_119                                 771
+#define IMG_CUSTOM_120                                 772
+#define IMG_CUSTOM_121                                 773
+#define IMG_CUSTOM_122                                 774
+#define IMG_CUSTOM_123                                 775
+#define IMG_CUSTOM_124                                 776
+#define IMG_CUSTOM_125                                 777
+#define IMG_CUSTOM_126                                 778
+#define IMG_CUSTOM_127                                 779
+#define IMG_CUSTOM_128                                 780
+#define IMG_TOON_1                                     781
+#define IMG_TOON_2                                     782
+#define IMG_TOON_3                                     783
+#define IMG_TOON_4                                     784
+#define IMG_TOON_5                                     785
+#define IMG_TOON_6                                     786
+#define IMG_TOON_7                                     787
+#define IMG_TOON_8                                     788
+#define IMG_TOON_9                                     789
+#define IMG_TOON_10                                    790
+#define IMG_TOON_11                                    791
+#define IMG_TOON_12                                    792
+#define IMG_TOON_13                                    793
+#define IMG_TOON_14                                    794
+#define IMG_TOON_15                                    795
+#define IMG_TOON_16                                    796
+#define IMG_TOON_17                                    797
+#define IMG_TOON_18                                    798
+#define IMG_TOON_19                                    799
+#define IMG_TOON_20                                    800
+#define IMG_MENU_CALIBRATE_RED                         801
+#define IMG_MENU_CALIBRATE_BLUE                                802
+#define IMG_MENU_CALIBRATE_YELLOW                      803
+#define IMG_MENU_BUTTON                                        804
+#define IMG_MENU_BUTTON_ACTIVE                         805
+#define IMG_MENU_BUTTON_LEFT                           806
+#define IMG_MENU_BUTTON_RIGHT                          807
+#define IMG_MENU_BUTTON_UP                             808
+#define IMG_MENU_BUTTON_DOWN                           809
+#define IMG_MENU_BUTTON_LEFT_ACTIVE                    810
+#define IMG_MENU_BUTTON_RIGHT_ACTIVE                   811
+#define IMG_MENU_BUTTON_UP_ACTIVE                      812
+#define IMG_MENU_BUTTON_DOWN_ACTIVE                    813
+#define IMG_MENU_SCROLLBAR                             814
+#define IMG_MENU_SCROLLBAR_ACTIVE                      815
+#define IMG_FONT_INITIAL_1                             816
+#define IMG_FONT_INITIAL_2                             817
+#define IMG_FONT_INITIAL_3                             818
+#define IMG_FONT_INITIAL_4                             819
+#define IMG_FONT_TITLE_1                               820
+#define IMG_FONT_TITLE_1_LEVELS                                821
+#define IMG_FONT_TITLE_2                               822
+#define IMG_FONT_MENU_1                                        823
+#define IMG_FONT_MENU_2                                        824
+#define IMG_FONT_TEXT_1                                        825
+#define IMG_FONT_TEXT_1_LEVELS                         826
+#define IMG_FONT_TEXT_1_SCORES                         827
+#define IMG_FONT_TEXT_1_PREVIEW                                828
+#define IMG_FONT_TEXT_2                                        829
+#define IMG_FONT_TEXT_2_LEVELS                         830
+#define IMG_FONT_TEXT_2_SCORES                         831
+#define IMG_FONT_TEXT_2_PREVIEW                                832
+#define IMG_FONT_TEXT_3                                        833
+#define IMG_FONT_TEXT_3_LEVELS                         834
+#define IMG_FONT_TEXT_3_SCORES                         835
+#define IMG_FONT_TEXT_3_PREVIEW                                836
+#define IMG_FONT_TEXT_4                                        837
+#define IMG_FONT_TEXT_4_LEVELS                         838
+#define IMG_FONT_TEXT_4_SCORES                         839
+#define IMG_FONT_INPUT_1                               840
+#define IMG_FONT_INPUT_1_MAIN                          841
+#define IMG_FONT_INPUT_1_ACTIVE                                842
+#define IMG_FONT_INPUT_1_ACTIVE_MAIN                   843
+#define IMG_FONT_INPUT_1_ACTIVE_SETUP                  844
+#define IMG_FONT_INPUT_2                               845
+#define IMG_FONT_INPUT_2_ACTIVE                                846
+#define IMG_FONT_OPTION_OFF                            847
+#define IMG_FONT_OPTION_ON                             848
+#define IMG_FONT_VALUE_1                               849
+#define IMG_FONT_VALUE_2                               850
+#define IMG_FONT_VALUE_OLD                             851
+#define IMG_FONT_LEVEL_NUMBER                          852
+#define IMG_FONT_TAPE_RECORDER                         853
+#define IMG_FONT_GAME_INFO                             854
+#define IMG_GLOBAL_BORDER                              855
+#define IMG_GLOBAL_DOOR                                        856
+#define IMG_EDITOR_ELEMENT_BORDER                      857
+#define IMG_BACKGROUND                                 858
+#define IMG_BACKGROUND_MAIN                            859
+#define IMG_BACKGROUND_LEVELS                          860
+#define IMG_BACKGROUND_SCORES                          861
+#define IMG_BACKGROUND_EDITOR                          862
+#define IMG_BACKGROUND_INFO                            863
+#define IMG_BACKGROUND_SETUP                           864
+#define IMG_BACKGROUND_DOOR                            865
 
-#define NUM_IMAGE_FILES                                        882
+#define NUM_IMAGE_FILES                                        866
 
 #endif /* CONF_GFX_H */
index 25137aba970ca559293b00d76ef67eea6033bf44..895ef92bf4774ad10dd9aebd0238322bce2110f7 100644 (file)
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-04-21 14:13]"
+#define COMPILE_DATE_STRING "[2003-04-22 01:54]"
index 53eb0ea0e32bd2aa9f0c991656bf5dc11f5f8c17..2a78b901c5f6e84f29604532567fa8c132a876f4 100644 (file)
@@ -1064,15 +1064,15 @@ static int editor_el_emerald_mine[] =
   EL_EM_KEY_3_FILE,
   EL_EM_KEY_4_FILE,
 
-  EL_EM_GATE_1_CLOSED,
-  EL_EM_GATE_2_CLOSED,
-  EL_EM_GATE_3_CLOSED,
-  EL_EM_GATE_4_CLOSED,
-
-  EL_EM_GATE_1_GRAY_CLOSED,
-  EL_EM_GATE_2_GRAY_CLOSED,
-  EL_EM_GATE_3_GRAY_CLOSED,
-  EL_EM_GATE_4_GRAY_CLOSED,
+  EL_EM_GATE_1,
+  EL_EM_GATE_2,
+  EL_EM_GATE_3,
+  EL_EM_GATE_4,
+
+  EL_EM_GATE_1_GRAY,
+  EL_EM_GATE_2_GRAY,
+  EL_EM_GATE_3_GRAY,
+  EL_EM_GATE_4_GRAY,
 };
 static int num_editor_el_emerald_mine = SIZEOF_ARRAY_INT(editor_el_emerald_mine);
 
@@ -1088,15 +1088,15 @@ static int editor_el_more[] =
   EL_KEY_3,
   EL_KEY_4,
 
-  EL_GATE_1_CLOSED,
-  EL_GATE_2_CLOSED,
-  EL_GATE_3_CLOSED,
-  EL_GATE_4_CLOSED,
+  EL_GATE_1,
+  EL_GATE_2,
+  EL_GATE_3,
+  EL_GATE_4,
 
-  EL_GATE_1_GRAY_CLOSED,
-  EL_GATE_2_GRAY_CLOSED,
-  EL_GATE_3_GRAY_CLOSED,
-  EL_GATE_4_GRAY_CLOSED,
+  EL_GATE_1_GRAY,
+  EL_GATE_2_GRAY,
+  EL_GATE_3_GRAY,
+  EL_GATE_4_GRAY,
 
   EL_ARROW_LEFT,
   EL_ARROW_RIGHT,
@@ -3683,11 +3683,9 @@ static void DrawPropertiesInfo()
   {
     { EP_AMOEBALIVE,           "- living amoeba"               },
     { EP_AMOEBOID,             "- amoeboid"                    },
-    { EP_SOLID,                        "- solid"                       },
     { EP_INDESTRUCTIBLE,       "- undestructible"              },
     { EP_SLIPPERY,             "- slippery"                    },
     { EP_ENEMY,                        "- enemy"                       },
-    { EP_MAUER,                        "- mauer"                       },
     { EP_CAN_FALL,             "- can fall"                    },
     { EP_CAN_SMASH,            "- can smash"                   },
     { EP_CAN_CHANGE,           "- can change"                  },
index c1e87624b867bf3a92a53e976a1cbbd0bee2cd48..1736366565c50950c217301519f37d01f8a42ec1 100644 (file)
@@ -941,7 +941,8 @@ void InitGame()
   if (setup.sound_music)
     PlayMusic(level_nr);
 
-  KeyboardAutoRepeatOff();
+  if (!tape.playing)
+    KeyboardAutoRepeatOff();
 
   if (options.debug)
   {
@@ -1847,26 +1848,6 @@ void SplashAcid(int x, int y)
   }
 }
 
-static int ChangeElementOnPlayfield(int element_old, int element_new)
-{
-  int x, y;
-  int num_changes = 0;
-
-  for(y=0; y<lev_fieldy; y++)
-  {
-    for(x=0; x<lev_fieldx; x++)
-    {
-      if (Feld[x][y] == element_old)
-      {
-       Feld[x][y] = element_new;
-       num_changes++;
-      }
-    }
-  }
-
-  return num_changes;
-}
-
 static void InitBeltMovement()
 {
   static int belt_base_element[4] =
@@ -2157,11 +2138,7 @@ static void ActivateTimegateSwitch(int x, int y)
          element == EL_TIMEGATE_CLOSING)
       {
        Feld[xx][yy] = EL_TIMEGATE_OPENING;
-#if 1
-       PlaySoundLevelElementAction(xx, yy, Feld[xx][yy], ACTION_OPENING);
-#else
        PlaySoundLevel(xx, yy, SND_TIMEGATE_OPENING);
-#endif
       }
 
       /*
@@ -3123,7 +3100,7 @@ void StartMoving(int x, int y)
          int flame_graphic = graphic + (i - 1);
 
          if (!IN_LEV_FIELD(xx, yy) ||
-             IS_SOLID(Feld[xx][yy]) || Feld[xx][yy] == EL_EXPLOSION)
+             IS_HISTORIC_SOLID(Feld[xx][yy]) || Feld[xx][yy] == EL_EXPLOSION)
            break;
 
          if (MovDelay[x][y])
@@ -4188,22 +4165,22 @@ void MauerWaechst(int x, int y)
     {
       if (MovDir[x][y] == MV_LEFT)
       {
-       if (IN_LEV_FIELD(x - 1, y) && IS_MAUER(Feld[x - 1][y]))
+       if (IN_LEV_FIELD(x - 1, y) && IS_WALL(Feld[x - 1][y]))
          DrawLevelField(x - 1, y);
       }
       else if (MovDir[x][y] == MV_RIGHT)
       {
-       if (IN_LEV_FIELD(x + 1, y) && IS_MAUER(Feld[x + 1][y]))
+       if (IN_LEV_FIELD(x + 1, y) && IS_WALL(Feld[x + 1][y]))
          DrawLevelField(x + 1, y);
       }
       else if (MovDir[x][y] == MV_UP)
       {
-       if (IN_LEV_FIELD(x, y - 1) && IS_MAUER(Feld[x][y - 1]))
+       if (IN_LEV_FIELD(x, y - 1) && IS_WALL(Feld[x][y - 1]))
          DrawLevelField(x, y - 1);
       }
       else
       {
-       if (IN_LEV_FIELD(x, y + 1) && IS_MAUER(Feld[x][y + 1]))
+       if (IN_LEV_FIELD(x, y + 1) && IS_WALL(Feld[x][y + 1]))
          DrawLevelField(x, y + 1);
       }
 
@@ -4302,13 +4279,13 @@ void MauerAbleger(int ax, int ay)
   if (element == EL_EXPANDABLE_WALL && (links_frei || rechts_frei))
     DrawLevelField(ax, ay);
 
-  if (!IN_LEV_FIELD(ax, ay-1) || IS_MAUER(Feld[ax][ay-1]))
+  if (!IN_LEV_FIELD(ax, ay-1) || IS_WALL(Feld[ax][ay-1]))
     oben_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax, ay+1) || IS_MAUER(Feld[ax][ay+1]))
+  if (!IN_LEV_FIELD(ax, ay+1) || IS_WALL(Feld[ax][ay+1]))
     unten_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax-1, ay) || IS_MAUER(Feld[ax-1][ay]))
+  if (!IN_LEV_FIELD(ax-1, ay) || IS_WALL(Feld[ax-1][ay]))
     links_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax+1, ay) || IS_MAUER(Feld[ax+1][ay]))
+  if (!IN_LEV_FIELD(ax+1, ay) || IS_WALL(Feld[ax+1][ay]))
     rechts_massiv = TRUE;
 
   if (((oben_massiv && unten_massiv) ||
@@ -5708,18 +5685,52 @@ void RemoveHero(struct PlayerInfo *player)
   ExitY = ZY = jy;
 }
 
-#if 0
 /*
   checkDiagonalPushing()
   -----------------------------------------------------------------------------
   check if diagonal input device direction results in pushing of object
+  (by checking if the alternative direction is walkable, diggable, ...)
 */
 
-static boolean checkDiagonalPushing(int x, int y, int real_dx, int real_dy)
+static boolean checkDiagonalPushing(struct PlayerInfo *player,
+                                   int x, int y, int real_dx, int real_dy)
 {
-}
+  int jx = player->jx, jy = player->jy;
+  int dx = x - jx, dy = y - jy;
+
+  if (real_dx && real_dy)      /* diagonal direction input => do check */
+  {
+    /* diagonal direction: check alternative direction */
+    int xx = jx + (dx == 0 ? real_dx : 0);
+    int yy = jy + (dy == 0 ? real_dy : 0);
+
+    if (IN_LEV_FIELD(xx, yy))
+    {
+      int element = Feld[xx][yy];
+
+#if 0
+      if (IS_HISTORIC_SOLID(element) !=
+         (!(IS_WALKABLE(element) ||
+            IS_DIGGABLE(element) ||
+            IS_COLLECTIBLE(element))))
+       printf("::: %d ['%s'] [%d, %d]\n",
+              element,
+              element_info[element].token_name,
+              game.engine_version, tape.engine_version);
 #endif
 
+      if (game.engine_version < VERSION_IDENT(2,2,0))
+       return IS_HISTORIC_SOLID(element);
+      else
+       return !(IS_WALKABLE(element) ||
+                IS_DIGGABLE(element) ||
+                IS_COLLECTIBLE(element));
+    }
+  }
+
+  return TRUE;         /* no diagonal direction input => push object */
+}
+
 /*
   DigField()
   -----------------------------------------------------------------------------
@@ -5757,9 +5768,15 @@ int DigField(struct PlayerInfo *player,
   if (IS_MOVING(x, y) || IS_PLAYER(x, y))
     return MF_NO_ACTION;
 
-  if (IS_TUBE(Feld[jx][jy]))
+#if 0
+  if (IS_TUBE(Feld[jx][jy]) || IS_TUBE(Back[jx][jy]))
+#else
+  if (IS_TUBE(Feld[jx][jy]) ||
+      (IS_TUBE(Back[jx][jy]) && game.engine_version >= VERSION_IDENT(2,2,0)))
+#endif
   {
     int i = 0;
+    int tube_element = (IS_TUBE(Feld[jx][jy]) ? Feld[jx][jy] : Back[jx][jy]);
     int tube_leave_directions[][2] =
     {
       { EL_TUBE_ANY,                   MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN },
@@ -5776,7 +5793,7 @@ int DigField(struct PlayerInfo *player,
       { -1,                            MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN }
     };
 
-    while (tube_leave_directions[i][0] != Feld[jx][jy])
+    while (tube_leave_directions[i][0] != tube_element)
     {
       i++;
       if (tube_leave_directions[i][0] == -1)   /* should not happen */
@@ -5912,8 +5929,6 @@ int DigField(struct PlayerInfo *player,
     {
       int key_nr = element - EL_KEY_1;
       int graphic = el2edimg(element);
-      int element_old, element_new;
-      int num_changes;
 
       RemoveField(x, y);
       player->key[key_nr] = TRUE;
@@ -5923,34 +5938,6 @@ int DigField(struct PlayerInfo *player,
       DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
                         graphic);
       PlaySoundLevel(x, y, SND_CLASS_KEY_COLLECTING);
-
-      element_old = EL_GATE_1_CLOSED + key_nr;
-      element_new = EL_GATE_1_OPEN + key_nr;
-      num_changes = ChangeElementOnPlayfield(element_old, element_new);
-      if (num_changes > 0)
-       PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING);
-
-      element_old = EL_GATE_1_GRAY_CLOSED + key_nr;
-      element_new = EL_GATE_1_GRAY_OPEN + key_nr;
-      num_changes = ChangeElementOnPlayfield(element_old, element_new);
-      if (num_changes > 0)
-       PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING);
-
-      if (game.engine_version < VERSION_IDENT(2,2,0))
-      {
-       element_old = EL_EM_GATE_1_CLOSED + key_nr;
-       element_new = EL_EM_GATE_1_OPEN + key_nr;
-       num_changes = ChangeElementOnPlayfield(element_old, element_new);
-       if (num_changes > 0)
-         PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING);
-
-       element_old = EL_EM_GATE_1_GRAY_CLOSED + key_nr;
-       element_new = EL_EM_GATE_1_GRAY_OPEN + key_nr;
-       num_changes = ChangeElementOnPlayfield(element_old, element_new);
-       if (num_changes > 0)
-         PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING);
-      }
-
       break;
     }
 
@@ -5961,8 +5948,6 @@ int DigField(struct PlayerInfo *player,
     {
       int key_nr = element - EL_EM_KEY_1;
       int graphic = el2edimg(EL_KEY_1 + key_nr);
-      int element_old, element_new;
-      int num_changes;
 
       RemoveField(x, y);
       player->key[key_nr] = TRUE;
@@ -5972,34 +5957,6 @@ int DigField(struct PlayerInfo *player,
       DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
                         graphic);
       PlaySoundLevel(x, y, SND_CLASS_KEY_COLLECTING);
-
-      element_old = EL_EM_GATE_1_CLOSED + key_nr;
-      element_new = EL_EM_GATE_1_OPEN + key_nr;
-      num_changes = ChangeElementOnPlayfield(element_old, element_new);
-      if (num_changes > 0)
-       PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING);
-
-      element_old = EL_EM_GATE_1_GRAY_CLOSED + key_nr;
-      element_new = EL_EM_GATE_1_GRAY_OPEN + key_nr;
-      num_changes = ChangeElementOnPlayfield(element_old, element_new);
-      if (num_changes > 0)
-       PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING);
-
-      if (game.engine_version < VERSION_IDENT(2,2,0))
-      {
-       element_old = EL_GATE_1_CLOSED + key_nr;
-       element_new = EL_GATE_1_OPEN + key_nr;
-       num_changes = ChangeElementOnPlayfield(element_old, element_new);
-       if (num_changes > 0)
-         PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING);
-
-       element_old = EL_GATE_1_GRAY_CLOSED + key_nr;
-       element_new = EL_GATE_1_GRAY_OPEN + key_nr;
-       num_changes = ChangeElementOnPlayfield(element_old, element_new);
-       if (num_changes > 0)
-         PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING);
-      }
-
       break;
     }
 
@@ -6127,11 +6084,17 @@ int DigField(struct PlayerInfo *player,
       if (!IN_LEV_FIELD(x+dx, y+dy) || !IS_FREE(x+dx, y+dy))
        return MF_NO_ACTION;
 
+#if 1
+      if (!checkDiagonalPushing(player, x, y, real_dx, real_dy))
+       return MF_NO_ACTION;
+#else
       if (real_dy)
       {
-       if (IN_LEV_FIELD(jx, jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_dy]))
+       if (IN_LEV_FIELD(jx, jy+real_dy) &&
+           !IS_HISTORIC_SOLID(Feld[jx][jy+real_dy]))
          return MF_NO_ACTION;
       }
+#endif
 
       if (player->push_delay == 0)
        player->push_delay = FrameCounter;
@@ -6170,34 +6133,28 @@ int DigField(struct PlayerInfo *player,
       PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
       break;
 
-    case EL_GATE_1_OPEN:
-    case EL_GATE_2_OPEN:
-    case EL_GATE_3_OPEN:
-    case EL_GATE_4_OPEN:
-#if 0
+    case EL_GATE_1:
+    case EL_GATE_2:
+    case EL_GATE_3:
+    case EL_GATE_4:
       if (!player->key[element - EL_GATE_1])
        return MF_NO_ACTION;
-#endif
       break;
 
-    case EL_GATE_1_GRAY_OPEN:
-    case EL_GATE_2_GRAY_OPEN:
-    case EL_GATE_3_GRAY_OPEN:
-    case EL_GATE_4_GRAY_OPEN:
-#if 0
+    case EL_GATE_1_GRAY:
+    case EL_GATE_2_GRAY:
+    case EL_GATE_3_GRAY:
+    case EL_GATE_4_GRAY:
       if (!player->key[element - EL_GATE_1_GRAY])
        return MF_NO_ACTION;
-#endif
       break;
 
-    case EL_EM_GATE_1_OPEN:
-    case EL_EM_GATE_2_OPEN:
-    case EL_EM_GATE_3_OPEN:
-    case EL_EM_GATE_4_OPEN:
-#if 0
+    case EL_EM_GATE_1:
+    case EL_EM_GATE_2:
+    case EL_EM_GATE_3:
+    case EL_EM_GATE_4:
       if (!player->key[element - EL_EM_GATE_1])
        return MF_NO_ACTION;
-#endif
       if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy))
        return MF_NO_ACTION;
 
@@ -6205,21 +6162,15 @@ int DigField(struct PlayerInfo *player,
       player->programmed_action = move_direction;
       DOUBLE_PLAYER_SPEED(player);
 
-#if 1
-      PlaySoundLevelAction(x, y, ACTION_PASSING);
-#else
       PlaySoundLevel(x, y, SND_CLASS_GATE_PASSING);
-#endif
       break;
 
-    case EL_EM_GATE_1_GRAY_OPEN:
-    case EL_EM_GATE_2_GRAY_OPEN:
-    case EL_EM_GATE_3_GRAY_OPEN:
-    case EL_EM_GATE_4_GRAY_OPEN:
-#if 0
+    case EL_EM_GATE_1_GRAY:
+    case EL_EM_GATE_2_GRAY:
+    case EL_EM_GATE_3_GRAY:
+    case EL_EM_GATE_4_GRAY:
       if (!player->key[element - EL_EM_GATE_1_GRAY])
        return MF_NO_ACTION;
-#endif
       if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy))
        return MF_NO_ACTION;
 
@@ -6385,16 +6336,23 @@ int DigField(struct PlayerInfo *player,
                  || !IS_SB_ELEMENT(element))))
        return MF_NO_ACTION;
 
+#if 1
+      if (!checkDiagonalPushing(player, x, y, real_dx, real_dy))
+       return MF_NO_ACTION;
+#else
       if (dx && real_dy)
       {
-       if (IN_LEV_FIELD(jx, jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_dy]))
+       if (IN_LEV_FIELD(jx, jy+real_dy) &&
+           !IS_HISTORIC_SOLID(Feld[jx][jy+real_dy]))
          return MF_NO_ACTION;
       }
       else if (dy && real_dx)
       {
-       if (IN_LEV_FIELD(jx+real_dx, jy) && !IS_SOLID(Feld[jx+real_dx][jy]))
+       if (IN_LEV_FIELD(jx+real_dx, jy) &&
+           !IS_HISTORIC_SOLID(Feld[jx+real_dx][jy]))
          return MF_NO_ACTION;
       }
+#endif
 
       if (player->push_delay == 0)
        player->push_delay = FrameCounter;
@@ -6494,16 +6452,23 @@ int DigField(struct PlayerInfo *player,
        if (!IN_LEV_FIELD(x+dx, y+dy) || !IS_FREE(x+dx, y+dy))
          return MF_NO_ACTION;
 
+#if 1
+       if (!checkDiagonalPushing(player, x, y, real_dx, real_dy))
+         return MF_NO_ACTION;
+#else
        if (dx && real_dy)
        {
-         if (IN_LEV_FIELD(jx, jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_dy]))
+         if (IN_LEV_FIELD(jx, jy+real_dy) &&
+             !IS_HISTORIC_SOLID(Feld[jx][jy+real_dy]))
            return MF_NO_ACTION;
        }
        else if (dy && real_dx)
        {
-         if (IN_LEV_FIELD(jx+real_dx, jy) && !IS_SOLID(Feld[jx+real_dx][jy]))
+         if (IN_LEV_FIELD(jx+real_dx, jy) &&
+             !IS_HISTORIC_SOLID(Feld[jx+real_dx][jy]))
            return MF_NO_ACTION;
        }
+#endif
 
        if (player->push_delay == 0)
          player->push_delay = FrameCounter;
@@ -6596,6 +6561,11 @@ boolean PlaceBomb(struct PlayerInfo *player)
       IS_ACTIVE_BOMB(element) || element == EL_EXPLOSION)
     return FALSE;
 
+#if 0
+  if (element != EL_EMPTY)
+    return FALSE;
+#endif
+
   if (element != EL_EMPTY)
   {
 #if 0
index 9ae24facf6b7dbf064384449a81610cd96064d72..8c574f39263e176144a1f4ad48daa0273239adb0 100644 (file)
@@ -1101,6 +1101,27 @@ void InitElementProperties()
     -1
   };
 
+  static int ep_keygate[] =
+  {
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
+    -1
+  };
+
   static int ep_can_be_crumbled[] =
   {
     EL_SAND,
@@ -1110,7 +1131,7 @@ void InitElementProperties()
     -1
   };
 
-  static int ep_solid[] =
+  static int ep_historic_solid[] =
   {
     EL_WALL,
     EL_EXPANDABLE_WALL,
@@ -1227,38 +1248,22 @@ void InitElementProperties()
     EL_EMC_STEELWALL_3,
     EL_EMC_STEELWALL_4,
     EL_CRYSTAL,
-    EL_GATE_1_CLOSED,
-    EL_GATE_2_CLOSED,
-    EL_GATE_3_CLOSED,
-    EL_GATE_4_CLOSED,
-    EL_GATE_1_OPEN,
-    EL_GATE_2_OPEN,
-    EL_GATE_3_OPEN,
-    EL_GATE_4_OPEN,
-    EL_GATE_1_GRAY_CLOSED,
-    EL_GATE_2_GRAY_CLOSED,
-    EL_GATE_3_GRAY_CLOSED,
-    EL_GATE_4_GRAY_CLOSED,
-    EL_GATE_1_GRAY_OPEN,
-    EL_GATE_2_GRAY_OPEN,
-    EL_GATE_3_GRAY_OPEN,
-    EL_GATE_4_GRAY_OPEN,
-    EL_EM_GATE_1_CLOSED,
-    EL_EM_GATE_2_CLOSED,
-    EL_EM_GATE_3_CLOSED,
-    EL_EM_GATE_4_CLOSED,
-    EL_EM_GATE_1_OPEN,
-    EL_EM_GATE_2_OPEN,
-    EL_EM_GATE_3_OPEN,
-    EL_EM_GATE_4_OPEN,
-    EL_EM_GATE_1_GRAY_CLOSED,
-    EL_EM_GATE_2_GRAY_CLOSED,
-    EL_EM_GATE_3_GRAY_CLOSED,
-    EL_EM_GATE_4_GRAY_CLOSED,
-    EL_EM_GATE_1_GRAY_OPEN,
-    EL_EM_GATE_2_GRAY_OPEN,
-    EL_EM_GATE_3_GRAY_OPEN,
-    EL_EM_GATE_4_GRAY_OPEN,
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1335,38 +1340,22 @@ void InitElementProperties()
     EL_EMC_STEELWALL_3,
     EL_EMC_STEELWALL_4,
     EL_CRYSTAL,
-    EL_GATE_1_CLOSED,
-    EL_GATE_2_CLOSED,
-    EL_GATE_3_CLOSED,
-    EL_GATE_4_CLOSED,
-    EL_GATE_1_OPEN,
-    EL_GATE_2_OPEN,
-    EL_GATE_3_OPEN,
-    EL_GATE_4_OPEN,
-    EL_GATE_1_GRAY_CLOSED,
-    EL_GATE_2_GRAY_CLOSED,
-    EL_GATE_3_GRAY_CLOSED,
-    EL_GATE_4_GRAY_CLOSED,
-    EL_GATE_1_GRAY_OPEN,
-    EL_GATE_2_GRAY_OPEN,
-    EL_GATE_3_GRAY_OPEN,
-    EL_GATE_4_GRAY_OPEN,
-    EL_EM_GATE_1_CLOSED,
-    EL_EM_GATE_2_CLOSED,
-    EL_EM_GATE_3_CLOSED,
-    EL_EM_GATE_4_CLOSED,
-    EL_EM_GATE_1_OPEN,
-    EL_EM_GATE_2_OPEN,
-    EL_EM_GATE_3_OPEN,
-    EL_EM_GATE_4_OPEN,
-    EL_EM_GATE_1_GRAY_CLOSED,
-    EL_EM_GATE_2_GRAY_CLOSED,
-    EL_EM_GATE_3_GRAY_CLOSED,
-    EL_EM_GATE_4_GRAY_CLOSED,
-    EL_EM_GATE_1_GRAY_OPEN,
-    EL_EM_GATE_2_GRAY_OPEN,
-    EL_EM_GATE_3_GRAY_OPEN,
-    EL_EM_GATE_4_GRAY_OPEN,
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
@@ -1441,41 +1430,25 @@ void InitElementProperties()
     -1
   };
 
-  static int ep_mauer[] =
+  static int ep_historic_wall[] =
   {
     EL_STEELWALL,
-    EL_GATE_1_CLOSED,
-    EL_GATE_2_CLOSED,
-    EL_GATE_3_CLOSED,
-    EL_GATE_4_CLOSED,
-    EL_GATE_1_OPEN,
-    EL_GATE_2_OPEN,
-    EL_GATE_3_OPEN,
-    EL_GATE_4_OPEN,
-    EL_GATE_1_GRAY_CLOSED,
-    EL_GATE_2_GRAY_CLOSED,
-    EL_GATE_3_GRAY_CLOSED,
-    EL_GATE_4_GRAY_CLOSED,
-    EL_GATE_1_GRAY_OPEN,
-    EL_GATE_2_GRAY_OPEN,
-    EL_GATE_3_GRAY_OPEN,
-    EL_GATE_4_GRAY_OPEN,
-    EL_EM_GATE_1_CLOSED,
-    EL_EM_GATE_2_CLOSED,
-    EL_EM_GATE_3_CLOSED,
-    EL_EM_GATE_4_CLOSED,
-    EL_EM_GATE_1_OPEN,
-    EL_EM_GATE_2_OPEN,
-    EL_EM_GATE_3_OPEN,
-    EL_EM_GATE_4_OPEN,
-    EL_EM_GATE_1_GRAY_CLOSED,
-    EL_EM_GATE_2_GRAY_CLOSED,
-    EL_EM_GATE_3_GRAY_CLOSED,
-    EL_EM_GATE_4_GRAY_CLOSED,
-    EL_EM_GATE_1_GRAY_OPEN,
-    EL_EM_GATE_2_GRAY_OPEN,
-    EL_EM_GATE_3_GRAY_OPEN,
-    EL_EM_GATE_4_GRAY_OPEN,
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
     EL_EXIT_CLOSED,
     EL_EXIT_OPENING,
     EL_EXIT_OPEN,
@@ -1768,38 +1741,22 @@ void InitElementProperties()
     EL_EM_KEY_2,
     EL_EM_KEY_3,
     EL_EM_KEY_4,
-    EL_GATE_1_CLOSED,
-    EL_GATE_2_CLOSED,
-    EL_GATE_3_CLOSED,
-    EL_GATE_4_CLOSED,
-    EL_GATE_1_OPEN,
-    EL_GATE_2_OPEN,
-    EL_GATE_3_OPEN,
-    EL_GATE_4_OPEN,
-    EL_GATE_1_GRAY_CLOSED,
-    EL_GATE_2_GRAY_CLOSED,
-    EL_GATE_3_GRAY_CLOSED,
-    EL_GATE_4_GRAY_CLOSED,
-    EL_GATE_1_GRAY_OPEN,
-    EL_GATE_2_GRAY_OPEN,
-    EL_GATE_3_GRAY_OPEN,
-    EL_GATE_4_GRAY_OPEN,
-    EL_EM_GATE_1_CLOSED,
-    EL_EM_GATE_2_CLOSED,
-    EL_EM_GATE_3_CLOSED,
-    EL_EM_GATE_4_CLOSED,
-    EL_EM_GATE_1_OPEN,
-    EL_EM_GATE_2_OPEN,
-    EL_EM_GATE_3_OPEN,
-    EL_EM_GATE_4_OPEN,
-    EL_EM_GATE_1_GRAY_CLOSED,
-    EL_EM_GATE_2_GRAY_CLOSED,
-    EL_EM_GATE_3_GRAY_CLOSED,
-    EL_EM_GATE_4_GRAY_CLOSED,
-    EL_EM_GATE_1_GRAY_OPEN,
-    EL_EM_GATE_2_GRAY_OPEN,
-    EL_EM_GATE_3_GRAY_OPEN,
-    EL_EM_GATE_4_GRAY_OPEN,
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
     EL_DYNAMITE,
     EL_INVISIBLE_STEELWALL,
     EL_INVISIBLE_WALL,
@@ -1976,14 +1933,14 @@ void InitElementProperties()
     EL_SOKOBAN_FIELD_EMPTY,
     EL_EXIT_OPEN,
     EL_SP_EXIT_OPEN,
-    EL_GATE_1_OPEN,
-    EL_GATE_2_OPEN,
-    EL_GATE_3_OPEN,
-    EL_GATE_4_OPEN,
-    EL_GATE_1_GRAY_OPEN,
-    EL_GATE_2_GRAY_OPEN,
-    EL_GATE_3_GRAY_OPEN,
-    EL_GATE_4_GRAY_OPEN,
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
     -1
   };
 
@@ -2010,14 +1967,14 @@ void InitElementProperties()
 
   static int ep_passable_over[] =
   {
-    EL_EM_GATE_1_OPEN,
-    EL_EM_GATE_2_OPEN,
-    EL_EM_GATE_3_OPEN,
-    EL_EM_GATE_4_OPEN,
-    EL_EM_GATE_1_GRAY_OPEN,
-    EL_EM_GATE_2_GRAY_OPEN,
-    EL_EM_GATE_3_GRAY_OPEN,
-    EL_EM_GATE_4_GRAY_OPEN,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
     EL_SWITCHGATE_OPEN,
     EL_TIMEGATE_OPEN,
     -1
@@ -2053,8 +2010,9 @@ void InitElementProperties()
     EL_TRAP,
     EL_INVISIBLE_SAND,
     EL_INVISIBLE_SAND_ACTIVE,
-#if 0
+#if 1
     EL_LANDMINE,
+    EL_TRAP_ACTIVE,
     EL_SP_BUGGY_BASE_ACTIVE,
 #endif
     -1
@@ -2239,12 +2197,13 @@ void InitElementProperties()
   {
     { ep_amoebalive,           EP_AMOEBALIVE           },
     { ep_amoeboid,             EP_AMOEBOID             },
+    { ep_keygate,              EP_KEYGATE              },
     { ep_can_be_crumbled,      EP_CAN_BE_CRUMBLED      },
-    { ep_solid,                        EP_SOLID                },
+    { ep_historic_solid,       EP_HISTORIC_SOLID       },
     { ep_indestructible,       EP_INDESTRUCTIBLE       },
     { ep_slippery,             EP_SLIPPERY             },
     { ep_enemy,                        EP_ENEMY                },
-    { ep_mauer,                        EP_MAUER                },
+    { ep_historic_wall,                EP_HISTORIC_WALL        },
     { ep_can_fall,             EP_CAN_FALL             },
     { ep_can_smash,            EP_CAN_SMASH            },
     { ep_can_change,           EP_CAN_CHANGE           },
@@ -2315,6 +2274,32 @@ void InitElementProperties()
   };
 #endif
 
+  static int no_wall_properties[] =
+  {
+    EP_AMOEBALIVE,
+    EP_AMOEBOID,
+    EP_CAN_BE_CRUMBLED,
+    EP_ENEMY,
+    EP_CAN_FALL,
+    EP_CAN_SMASH,
+    EP_CAN_MOVE,
+    EP_COULD_MOVE,
+    EP_DONT_GO_TO,
+    EP_FOOD_DARK_YAMYAM,
+    EP_GEM,
+    EP_FOOD_PENGUIN,
+    EP_PUSHABLE,
+    EP_PLAYER,
+    EP_ACCESSIBLE,
+    EP_DIGGABLE,
+    EP_COLLECTIBLE,
+    EP_ACTIVE_BOMB,
+    EP_BELT,
+    EP_BELT_ACTIVE,
+    EP_TUBE,
+    -1
+  };
+
   /* always start with reliable default values (no properties) */
   for (i=0; i<MAX_NUM_ELEMENTS; i++)
     for (j=0; j<NUM_EP_BITFIELDS; j++)
@@ -2352,6 +2337,28 @@ void InitElementProperties()
       SET_PROPERTY(i, EP_ACCESSIBLE, TRUE);
   }
 
+  /* dynamically determine wall-like elements */
+  for (i=0; i < MAX_NUM_ELEMENTS; i++)
+  {
+    /* default: element is wall-like */
+    SET_PROPERTY(i, EP_WALL, TRUE);
+
+    for (j=0; no_wall_properties[j] != -1; j++)
+      if (HAS_PROPERTY(i, no_wall_properties[j]) ||
+         i >= EL_FIRST_RUNTIME_UNREAL)
+       SET_PROPERTY(i, EP_WALL, FALSE);
+
+    if (IS_HISTORIC_WALL(i))
+      SET_PROPERTY(i, EP_WALL, TRUE);
+
+#if 0
+    printf("::: %d: %s '%s'\n",
+          i,
+          (IS_WALL(i) ? "IS A WALL:    " : "IS NOT A WALL:"),
+          element_info[i].token_name);
+#endif
+  }
+
 #if 0
   /* determine inactive elements (used for engine main loop optimization) */
   for (i=0; i < MAX_NUM_ELEMENTS; i++)
@@ -2370,27 +2377,6 @@ void InitElementProperties()
 #endif
   }
 #endif
-
-#if 0
-  for (i=0; i < MAX_NUM_ELEMENTS; i++)
-  {
-    boolean element_is_solid = TRUE;
-
-    if (IS_DIGGABLE(i) ||
-       IS_COLLECTIBLE(i) ||
-       CAN_FALL(i) ||
-       CAN_MOVE(i) ||
-       IS_PUSHABLE(i))
-      element_is_solid = FALSE;
-
-    if (IS_INDESTRUCTIBLE(i))
-      element_is_solid = TRUE;
-
-    if (element_is_solid != HAS_PROPERTY(i, EP_SOLID))
-      printf("::: '%s' should %s solid\n", element_info[i].token_name,
-            (HAS_PROPERTY(i, EP_SOLID) ? "NOT be" : "be"));
-  }
-#endif
 }
 
 static void InitGlobal()
index e9817ae3b7e59b8a8dc1cf13b13ad10c8b57f503..836b436fd9b30bc5a2e4adc2f016e42aa081437b 100644 (file)
@@ -289,45 +289,42 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "blue key"
   },
   {
-    "gate_1_closed",
+    "gate_1",
     "gate",
     "red door"
   },
   {
-    "gate_2_closed",
+    "gate_2",
     "gate",
     "yellow door"
   },
   {
-    "gate_3_closed",
+    "gate_3",
     "gate",
     "green door"
   },
   {
-    "gate_4_closed",
+    "gate_4",
     "gate",
     "blue door"
   },
   {
-    "gate_1_gray_closed",
+    "gate_1_gray",
     "gate",
     "gray door (opened by red key)"
   },
   {
-    "gate_2_gray_closed",
+    "gate_2_gray",
     "gate",
-    "gray door (opened by yellow key)"
-  },
+    "gray door (opened by yellow key)"},
   {
-    "gate_3_gray_closed",
+    "gate_3_gray",
     "gate",
-    "gray door (opened by green key)"
-  },
+    "gray door (opened by green key)"},
   {
-    "gate_4_gray_closed",
+    "gate_4_gray",
     "gate",
-    "gray door (opened by blue key)"
-  },
+    "gray door (opened by blue key)"},
   {
     "dynamite",
     "dynamite",
@@ -1118,22 +1115,22 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "growing wall (any direction)"
   },
   {
-    "em_gate_1_closed",
+    "em_gate_1",
     "gate",
     "red door (EM style)"
   },
   {
-    "em_gate_2_closed",
+    "em_gate_2",
     "gate",
     "yellow door (EM style)"
   },
   {
-    "em_gate_3_closed",
+    "em_gate_3",
     "gate",
     "green door (EM style)"
   },
   {
-    "em_gate_4_closed",
+    "em_gate_4",
     "gate",
     "blue door (EM style)"
   },
@@ -1353,22 +1350,22 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "chip (lower half)"
   },
   {
-    "em_gate_1_gray_closed",
+    "em_gate_1_gray",
     "gate",
     "gray door (EM style, red key)"
   },
   {
-    "em_gate_2_gray_closed",
+    "em_gate_2_gray",
     "gate",
     "gray door (EM style, yellow key)"
   },
   {
-    "em_gate_3_gray_closed",
+    "em_gate_3_gray",
     "gate",
     "gray door (EM style, green key)"
   },
   {
-    "em_gate_4_gray_closed",
+    "em_gate_4_gray",
     "gate",
     "gray door (EM style, blue key)"
   },
@@ -2777,86 +2774,6 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "magic_wall",
     "-"
   },
-  {
-    "gate_1_open",
-    "gate",
-    "red door"
-  },
-  {
-    "gate_2_open",
-    "gate",
-    "yellow door"
-  },
-  {
-    "gate_3_open",
-    "gate",
-    "green door"
-  },
-  {
-    "gate_4_open",
-    "gate",
-    "blue door"
-  },
-  {
-    "gate_1_gray_open",
-    "gate",
-    "gray door (opened by red key)"
-  },
-  {
-    "gate_2_gray_open",
-    "gate",
-    "gray door (opened by yellow key)"
-  },
-  {
-    "gate_3_gray_open",
-    "gate",
-    "gray door (opened by green key)"
-  },
-  {
-    "gate_4_gray_open",
-    "gate",
-    "gray door (opened by blue key)"
-  },
-  {
-    "em_gate_1_open",
-    "gate",
-    "red door (EM style)"
-  },
-  {
-    "em_gate_2_open",
-    "gate",
-    "yellow door (EM style)"
-  },
-  {
-    "em_gate_3_open",
-    "gate",
-    "green door (EM style)"
-  },
-  {
-    "em_gate_4_open",
-    "gate",
-    "blue door (EM style)"
-  },
-  {
-    "em_gate_1_gray_open",
-    "gate",
-    "gray door (EM style, red key)"
-  },
-  {
-    "em_gate_2_gray_open",
-    "gate",
-    "gray door (EM style, yellow key)"
-  },
-  {
-    "em_gate_3_gray_open",
-    "gate",
-    "gray door (EM style, green key)"
-  },
-  {
-    "em_gate_4_gray_open",
-    "gate",
-    "gray door (EM style, blue key)"
-  },
 
   /* ----------------------------------------------------------------------- */
   /* "unreal" (and therefore not drawable) runtime elements                  */
index 2833e094cfacf96086e69d8ae92a6e7223c1bb82..a690c06446194b726e13642a0a7bc82be0c2ed6b 100644 (file)
 #define EP_AMOEBALIVE          0
 #define EP_AMOEBOID            1
 #define EP_CAN_BE_CRUMBLED     2
-
-#define EP_SOLID               4
+#define EP_KEYGATE             3
+#define EP_HISTORIC_SOLID      4
 #define EP_INDESTRUCTIBLE      5
 #define EP_SLIPPERY            6
 #define EP_ENEMY               7
-#define EP_MAUER               8
+#define EP_HISTORIC_WALL       8
 #define EP_CAN_FALL            9
 #define EP_CAN_SMASH           10
 #define EP_CAN_CHANGE          11
 #define EP_SP_ELEMENT          44
 #define EP_HAS_CONTENT         45
 #define EP_TUBE                        46
+#define EP_WALL                        47
 
-#define NUM_ELEMENT_PROPERTIES 47
+#define NUM_ELEMENT_PROPERTIES 48
 
 #define NUM_EP_BITFIELDS       ((NUM_ELEMENT_PROPERTIES + 31) / 32)
 #define EP_BITFIELD_BASE       0
 #define IS_AMOEBALIVE(e)       HAS_PROPERTY(e, EP_AMOEBALIVE)
 #define IS_AMOEBOID(e)         HAS_PROPERTY(e, EP_AMOEBOID)
 #define CAN_BE_CRUMBLED(e)     HAS_PROPERTY(e, EP_CAN_BE_CRUMBLED)
-
-#define IS_SOLID(e)            HAS_PROPERTY(e, EP_SOLID)
+#define IS_KEYGATE(e)          HAS_PROPERTY(e, EP_KEYGATE)
+#define IS_HISTORIC_SOLID(e)   HAS_PROPERTY(e, EP_HISTORIC_SOLID)
 #define IS_INDESTRUCTIBLE(e)   HAS_PROPERTY(e, EP_INDESTRUCTIBLE)
 #define IS_SLIPPERY(e)         HAS_PROPERTY(e, EP_SLIPPERY)
 #define IS_ENEMY(e)            HAS_PROPERTY(e, EP_ENEMY)
-#define IS_MAUER(e)            HAS_PROPERTY(e, EP_MAUER)
+#define IS_HISTORIC_WALL(e)    HAS_PROPERTY(e, EP_HISTORIC_WALL)
 #define CAN_FALL(e)            HAS_PROPERTY(e, EP_CAN_FALL)
 #define CAN_SMASH(e)           HAS_PROPERTY(e, EP_CAN_SMASH)
 #define CAN_CHANGE(e)          HAS_PROPERTY(e, EP_CAN_CHANGE)
 #define IS_SP_ELEMENT(e)       HAS_PROPERTY(e, EP_SP_ELEMENT)
 #define HAS_CONTENT(e)         HAS_PROPERTY(e, EP_HAS_CONTENT)
 #define IS_TUBE(e)             HAS_PROPERTY(e, EP_TUBE)
+#define IS_WALL(e)             HAS_PROPERTY(e, EP_WALL)
 
 #define IS_CUSTOM_ELEMENT(e)   ((e) >= EL_CUSTOM_START &&      \
                                 (e) <= EL_CUSTOM_END)
 #define EL_KEY_2                       33
 #define EL_KEY_3                       34
 #define EL_KEY_4                       35
-#define EL_GATE_1_CLOSED               36
-#define EL_GATE_2_CLOSED               37
-#define EL_GATE_3_CLOSED               38
-#define EL_GATE_4_CLOSED               39
-#define EL_GATE_1_GRAY_CLOSED          40
-#define EL_GATE_2_GRAY_CLOSED          41
-#define EL_GATE_3_GRAY_CLOSED          42
-#define EL_GATE_4_GRAY_CLOSED          43
+#define EL_GATE_1                      36
+#define EL_GATE_2                      37
+#define EL_GATE_3                      38
+#define EL_GATE_4                      39
+#define EL_GATE_1_GRAY                 40
+#define EL_GATE_2_GRAY                 41
+#define EL_GATE_3_GRAY                 42
+#define EL_GATE_4_GRAY                 43
 #define EL_DYNAMITE                    44
 #define EL_PACMAN                      45
 #define EL_INVISIBLE_WALL              46
 #define EL_EXPANDABLE_WALL_VERTICAL    201
 #define EL_EXPANDABLE_WALL_ANY         202
 
-#define EL_EM_GATE_1_CLOSED            203
-#define EL_EM_GATE_2_CLOSED            204
-#define EL_EM_GATE_3_CLOSED            205
-#define EL_EM_GATE_4_CLOSED            206
+#define EL_EM_GATE_1                   203
+#define EL_EM_GATE_2                   204
+#define EL_EM_GATE_3                   205
+#define EL_EM_GATE_4                   206
 
 #define EL_EM_KEY_2_FILE                       207
 #define EL_EM_KEY_3_FILE                       208
 #define EL_SP_CHIP_BOTTOM              (EL_SP_START + 39)
 #define EL_SP_END                      (EL_SP_START + 39)
 
-#define EL_EM_GATE_1_GRAY_CLOSED       250
-#define EL_EM_GATE_2_GRAY_CLOSED       251
-#define EL_EM_GATE_3_GRAY_CLOSED       252
-#define EL_EM_GATE_4_GRAY_CLOSED       253
+#define EL_EM_GATE_1_GRAY              250
+#define EL_EM_GATE_2_GRAY              251
+#define EL_EM_GATE_3_GRAY              252
+#define EL_EM_GATE_4_GRAY              253
 
 #define EL_UNUSED_254                  254
 #define EL_UNUSED_255                  255
 #define EL_BD_MAGIC_WALL_EMPTYING      (EL_FIRST_RUNTIME_REAL + 43)
 #define EL_MAGIC_WALL_DEAD             (EL_FIRST_RUNTIME_REAL + 44)
 #define EL_BD_MAGIC_WALL_DEAD          (EL_FIRST_RUNTIME_REAL + 45)
-#define EL_GATE_1_OPEN                 (EL_FIRST_RUNTIME_REAL + 46)
-#define EL_GATE_2_OPEN                 (EL_FIRST_RUNTIME_REAL + 47)
-#define EL_GATE_3_OPEN                 (EL_FIRST_RUNTIME_REAL + 48)
-#define EL_GATE_4_OPEN                 (EL_FIRST_RUNTIME_REAL + 49)
-#define EL_GATE_1_GRAY_OPEN            (EL_FIRST_RUNTIME_REAL + 50)
-#define EL_GATE_2_GRAY_OPEN            (EL_FIRST_RUNTIME_REAL + 51)
-#define EL_GATE_3_GRAY_OPEN            (EL_FIRST_RUNTIME_REAL + 52)
-#define EL_GATE_4_GRAY_OPEN            (EL_FIRST_RUNTIME_REAL + 53)
-#define EL_EM_GATE_1_OPEN              (EL_FIRST_RUNTIME_REAL + 54)
-#define EL_EM_GATE_2_OPEN              (EL_FIRST_RUNTIME_REAL + 55)
-#define EL_EM_GATE_3_OPEN              (EL_FIRST_RUNTIME_REAL + 56)
-#define EL_EM_GATE_4_OPEN              (EL_FIRST_RUNTIME_REAL + 57)
-#define EL_EM_GATE_1_GRAY_OPEN         (EL_FIRST_RUNTIME_REAL + 58)
-#define EL_EM_GATE_2_GRAY_OPEN         (EL_FIRST_RUNTIME_REAL + 59)
-#define EL_EM_GATE_3_GRAY_OPEN         (EL_FIRST_RUNTIME_REAL + 60)
-#define EL_EM_GATE_4_GRAY_OPEN         (EL_FIRST_RUNTIME_REAL + 61)
 
 /* "unreal" (and therefore not drawable) runtime elements */
-#define EL_FIRST_RUNTIME_UNREAL                (EL_FIRST_RUNTIME_REAL + 62)
+#define EL_FIRST_RUNTIME_UNREAL                (EL_FIRST_RUNTIME_REAL + 46)
 
 #define EL_BLOCKED                     (EL_FIRST_RUNTIME_UNREAL + 0)
 #define EL_EXPLOSION                   (EL_FIRST_RUNTIME_UNREAL + 1)
index 1c20e6ad344e8e1b84816e128439bbea2143c65e..eab0b75eee96855176fe7cffc5940338c5d23c7d 100644 (file)
@@ -579,15 +579,15 @@ static int helpscreen_action[] =
   IMG_KEY_3,                           50,
   IMG_KEY_4,                           50,                     HA_NEXT,
 
-  IMG_GATE_1_CLOSED,                   50,
-  IMG_GATE_2_CLOSED,                   50,
-  IMG_GATE_3_CLOSED,                   50,
-  IMG_GATE_4_CLOSED,                   50,                     HA_NEXT,
-
-  IMG_GATE_1_GRAY_CLOSED,              50,
-  IMG_GATE_2_GRAY_CLOSED,              50,
-  IMG_GATE_3_GRAY_CLOSED,              50,
-  IMG_GATE_4_GRAY_CLOSED,              50,                     HA_NEXT,
+  IMG_GATE_1,                          50,
+  IMG_GATE_2,                          50,
+  IMG_GATE_3,                          50,
+  IMG_GATE_4,                          50,                     HA_NEXT,
+
+  IMG_GATE_1_GRAY,                     50,
+  IMG_GATE_2_GRAY,                     50,
+  IMG_GATE_3_GRAY,                     50,
+  IMG_GATE_4_GRAY,                     50,                     HA_NEXT,
 
   IMG_DYNAMITE,                                -1,                     HA_NEXT,
 
index 5bba1c107785e4bfbb5dc8dc1c70e03ca7037f4a..0c7bf17b1d6e647eec594cc2e5b723f828dd0ab7 100644 (file)
@@ -1072,9 +1072,9 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
   {
     boolean left_stopped = FALSE, right_stopped = FALSE;
 
-    if (!IN_LEV_FIELD(lx - 1, ly) || IS_MAUER(Feld[lx - 1][ly]))
+    if (!IN_LEV_FIELD(lx - 1, ly) || IS_WALL(Feld[lx - 1][ly]))
       left_stopped = TRUE;
-    if (!IN_LEV_FIELD(lx + 1, ly) || IS_MAUER(Feld[lx + 1][ly]))
+    if (!IN_LEV_FIELD(lx + 1, ly) || IS_WALL(Feld[lx + 1][ly]))
       right_stopped = TRUE;
 
     if (left_stopped && right_stopped)