X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=39976f9d9522949cc221b0234f69950c968b4e08;hb=200ef56170d80105ec6a2c499361a33b9fd3c3c9;hp=1ecb117b915ac518312a778f0f1f3f5086ba47a6;hpb=394fd0859ee1fd61606798b4683edd3bd5295c93;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 1ecb117b..39976f9d 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -5515,6 +5515,10 @@ unsigned int MoveDoor(unsigned int door_state)
       }
     }
 
+    SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
+
+    game.any_door_active = TRUE;
+
     for (k = start; k < num_move_steps; k++)
     {
       int last_frame = num_move_steps - 1;	// last frame of this "for" loop
@@ -5709,6 +5713,8 @@ unsigned int MoveDoor(unsigned int door_state)
 	BackToFront();
       }
     }
+
+    game.any_door_active = FALSE;
   }
 
   if (door_state & DOOR_ACTION_1)
@@ -6006,6 +6012,88 @@ static void HandleToolButtons(struct GadgetInfo *gi)
   request_gadget_id = gi->custom_id;
 }
 
+static int getEngineElement_Ext(int element, int game_engine_type, boolean is_drawing_element)
+{
+  int el_empty;
+  int el_player;
+  int el_sand;
+  int el_wall;
+  int el_steelwall;
+  int el_exit_closed;
+
+  if (game_engine_type == -1)
+    game_engine_type = level.game_engine_type;
+
+  if (level.game_engine_type == GAME_ENGINE_TYPE_BD)
+  {
+    el_empty		= EL_EMPTY;
+    el_player		= EL_BD_PLAYER;
+    el_sand		= EL_BD_SAND;
+    el_wall		= EL_BD_WALL;
+    el_steelwall	= EL_BD_STEELWALL;
+    el_exit_closed	= EL_BD_EXIT_CLOSED;
+  }
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+  {
+    el_empty		= EL_EMPTY;
+    el_player		= EL_PLAYER_1;
+    el_sand		= EL_SAND;
+    el_wall		= EL_WALL;
+    el_steelwall	= EL_STEELWALL;
+    el_exit_closed	= EL_EM_EXIT_CLOSED;
+  }
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+  {
+    el_empty		= EL_EMPTY;
+    el_player		= EL_SP_MURPHY;
+    el_sand		= EL_SP_BASE;
+    el_wall		= EL_SP_CHIP_SINGLE;
+    el_steelwall	= EL_SP_HARDWARE_GRAY;
+    el_exit_closed	= EL_SP_EXIT_CLOSED;
+  }
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+  {
+    el_empty		= EL_EMPTY;
+    el_player		= EL_MM_MCDUFFIN_DOWN;
+    el_sand		= EL_EMPTY;
+    el_wall		= EL_MM_WOODEN_WALL;
+    el_steelwall	= EL_MM_STEEL_WALL;
+    el_exit_closed	= EL_MM_EXIT_CLOSED;
+
+    if (is_drawing_element)
+    {
+      el_wall		= EL_MM_MIRROR_START;
+      el_sand		= EL_MM_WOODEN_WALL;
+    }
+  }
+  else
+  {
+    el_empty		= EL_EMPTY;
+    el_player		= EL_PLAYER_1;
+    el_sand		= EL_SAND;
+    el_wall		= EL_WALL;
+    el_steelwall	= EL_STEELWALL;
+    el_exit_closed	= EL_EXIT_CLOSED;
+  }
+
+  return (element == EL_EMPTY		? el_empty :
+	  element == EL_PLAYER_1	? el_player :
+	  element == EL_SAND		? el_sand :
+	  element == EL_WALL		? el_wall :
+	  element == EL_STEELWALL	? el_steelwall :
+	  element == EL_EXIT_CLOSED	? el_exit_closed : EL_EMPTY);
+}
+
+int getEngineElement(int element)
+{
+  return getEngineElement_Ext(element, -1, FALSE);
+}
+
+int getDrawingElement(int element)
+{
+  return getEngineElement_Ext(element, -1, TRUE);
+}
+
 static struct Mapping_BD_to_RND_object
 {
   int element_bd;
@@ -6296,7 +6384,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPANDING_WALL_SWITCH,			TRUE,
-    EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL,	-1, -1
+    EL_BD_EXPANDABLE_WALL_SWITCH,		-1, -1
   },
   {
     O_CREATURE_SWITCH,				TRUE,
@@ -6316,7 +6404,7 @@ bd_object_mapping_list[] =
   },
   {
     O_CONVEYOR_DIR_SWITCH,			TRUE,
-    EL_BD_CONVEYOR_DIR_SWITCH_NORMAL,		-1, -1
+    EL_BD_CONVEYOR_DIR_SWITCH,			-1, -1
   },
   {
     O_ACID,					TRUE,
@@ -6894,6 +6982,10 @@ bd_object_mapping_list[] =
     O_PLAYER_BOMB,				TRUE,
     EL_BD_PLAYER_WITH_BOMB,			-1, -1
   },
+  {
+    O_PLAYER_ROCKET_LAUNCHER,			TRUE,
+    EL_BD_PLAYER_WITH_ROCKET_LAUNCHER,		-1, -1
+  },
   {
     O_PLAYER_GLUED,				TRUE,
     EL_BD_PLAYER_GLUED,				-1, -1
@@ -6902,6 +6994,26 @@ bd_object_mapping_list[] =
     O_PLAYER_STIRRING,				TRUE,
     EL_BD_PLAYER_STIRRING,			-1, -1
   },
+  {
+    O_ROCKET_LAUNCHER,				TRUE,
+    EL_BD_ROCKET_LAUNCHER,			-1, -1
+  },
+  {
+    O_ROCKET_1,					TRUE,
+    EL_BD_ROCKET_RIGHT,				-1, -1
+  },
+  {
+    O_ROCKET_2,					TRUE,
+    EL_BD_ROCKET_UP,				-1, -1
+  },
+  {
+    O_ROCKET_3,					TRUE,
+    EL_BD_ROCKET_LEFT,				-1, -1
+  },
+  {
+    O_ROCKET_4,					TRUE,
+    EL_BD_ROCKET_DOWN,				-1, -1
+  },
   {
     O_BOMB,					TRUE,
     EL_BD_BOMB,					-1, -1
@@ -7369,6 +7481,14 @@ bd_object_mapping_list[] =
     O_PLAYER_RIGHT,				FALSE,
     EL_BD_PLAYER,				ACTION_MOVING, MV_BIT_RIGHT
   },
+  {
+    O_PLAYER_UP,				FALSE,
+    EL_BD_PLAYER,				ACTION_MOVING, MV_BIT_UP
+  },
+  {
+    O_PLAYER_DOWN,				FALSE,
+    EL_BD_PLAYER,				ACTION_MOVING, MV_BIT_DOWN
+  },
   {
     O_PLAYER_BLINK,				FALSE,
     EL_BD_PLAYER,				ACTION_BORING_1, -1
@@ -7381,17 +7501,25 @@ bd_object_mapping_list[] =
     O_PLAYER_TAP_BLINK,				FALSE,
     EL_BD_PLAYER,				ACTION_BORING_3, -1
   },
+  {
+    O_PLAYER_PUSH_LEFT,				FALSE,
+    EL_BD_PLAYER,				ACTION_PUSHING, MV_BIT_LEFT
+  },
+  {
+    O_PLAYER_PUSH_RIGHT,			FALSE,
+    EL_BD_PLAYER,				ACTION_PUSHING, MV_BIT_RIGHT
+  },
   {
     O_CREATURE_SWITCH_ON,			FALSE,
     EL_BD_CREATURE_SWITCH_ACTIVE,		-1, -1
   },
   {
     O_EXPANDING_WALL_SWITCH_HORIZ,		FALSE,
-    EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL,	-1, -1
+    EL_BD_EXPANDABLE_WALL_SWITCH,		-1, -1
   },
   {
     O_EXPANDING_WALL_SWITCH_VERT,		FALSE,
-    EL_BD_EXPANDABLE_WALL_SWITCH_VERTICAL,	-1, -1
+    EL_BD_EXPANDABLE_WALL_SWITCH_ACTIVE,	-1, -1
   },
   {
     O_GRAVITY_SWITCH_ACTIVE,			FALSE,
@@ -7407,11 +7535,11 @@ bd_object_mapping_list[] =
   },
   {
     O_CONVEYOR_DIR_NORMAL,			FALSE,
-    EL_BD_CONVEYOR_DIR_SWITCH_NORMAL,		-1, -1
+    EL_BD_CONVEYOR_DIR_SWITCH,			-1, -1
   },
   {
     O_CONVEYOR_DIR_CHANGED,			FALSE,
-    EL_BD_CONVEYOR_DIR_SWITCH_CHANGED,		-1, -1
+    EL_BD_CONVEYOR_DIR_SWITCH_ACTIVE,		-1, -1
   },
   {
     O_CONVEYOR_SWITCH_OFF,			FALSE,