X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=7c81b8f7748ba8f67339e8d784d6898371729a8d;hb=edaa850fd2d2cae7ec31961fae3d56487e710c71;hp=d83cb75aada4810bf6a2b235d695e45d54976c10;hpb=00e52ef0b245eadf05f9dd416b29ebec5a47c767;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index d83cb75a..7c81b8f7 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -6012,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;
@@ -7399,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
@@ -7411,6 +7501,14 @@ 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
@@ -11333,6 +11431,27 @@ void PlaySoundSelecting(void)
 #endif
 }
 
+void ToggleAudioSampleRateIfNeeded(void)
+{
+  int setup_audio_sample_rate = (setup.audio_sample_rate_44100 ? 44100 : 22050);
+
+  // if setup and audio sample rate are already matching, nothing do do
+  if ((setup_audio_sample_rate == audio.sample_rate) ||
+      !audio.sound_available)
+    return;
+
+#if 1
+  // apparently changing the audio output sample rate does not work at runtime,
+  // so currently the program has to be restarted to apply the new sample rate
+  Request("Please restart the program to change audio sample rate!", REQ_CONFIRM);
+#else
+  SDLReopenAudio();
+
+  // set setup value according to successfully changed audio sample rate
+  setup.audio_sample_rate_44100 = (audio.sample_rate == 44100);
+#endif
+}
+
 void ToggleFullscreenIfNeeded(void)
 {
   // if setup and video fullscreen state are already matching, nothing do do