X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=5fb84526d33c99386810b2fb5ebe1cfee6006b19;hb=a4248791dc5c536bd346033d20e1f41f27ecd945;hp=98e60731333f9add8584999855c3ee65459e3e1f;hpb=a7a3a417929449b5d1c32a5ef9e67693015d187b;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 98e60731..5fb84526 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -5896,7 +5896,8 @@ void CreateToolButtons(void)
       }
     }
 
-    if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4)
+    if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4 &&
+	pos->draw_player)
     {
       int player_nr = id - TOOL_CTRL_ID_PLAYER_1;
 
@@ -8205,10 +8206,6 @@ int map_element_RND_to_MM(int element_rnd)
 	  element_rnd <= EL_MM_RUNTIME_END ?
 	  EL_MM_RUNTIME_START_NATIVE + element_rnd - EL_MM_RUNTIME_START :
 
-	  element_rnd >= EL_MM_DUMMY_START &&
-	  element_rnd <= EL_MM_DUMMY_END ?
-	  EL_MM_DUMMY_START_NATIVE + element_rnd - EL_MM_DUMMY_START :
-
 	  EL_MM_EMPTY_NATIVE);
 }
 
@@ -8234,10 +8231,6 @@ int map_element_MM_to_RND(int element_mm)
 	  element_mm <= EL_MM_RUNTIME_END_NATIVE ?
 	  EL_MM_RUNTIME_START + element_mm - EL_MM_RUNTIME_START_NATIVE :
 
-	  element_mm >= EL_MM_DUMMY_START_NATIVE &&
-	  element_mm <= EL_MM_DUMMY_END_NATIVE ?
-	  EL_MM_DUMMY_START + element_mm - EL_MM_DUMMY_START_NATIVE :
-
 	  EL_EMPTY);
 }
 
@@ -8331,6 +8324,11 @@ int el2img_mm(int element_mm)
   return el2img(map_element_MM_to_RND(element_mm));
 }
 
+int el_act2img_mm(int element_mm, int action)
+{
+  return el_act2img(map_element_MM_to_RND(element_mm), action);
+}
+
 int el_act_dir2img(int element, int action, int direction)
 {
   element = GFX_ELEMENT(element);