X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=19965d47a3c9ab9f08a41928f16ce316f48223c5;hb=93aecd5b2aebfcdda8e26d60b952bd9224c8dede;hp=5c259419dc967e6c4d54dc43c52c186dbf1e6f33;hpb=9d4635941641ae191aa2fac35e8f89052ca07fa8;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 5c259419..19965d47 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -5351,33 +5351,30 @@ void CreateToolButtons()
       if (x < 0 || x + gfx->width  > request.width ||
 	  y < 0 || y + gfx->height > request.height)
       {
-	// use left padding of "yes" button as default border padding
-	int padding = toolbutton_info[TOOL_CTRL_ID_YES].pos->x;
-
 	if (id == TOOL_CTRL_ID_YES)
 	{
-	  x = padding;
-	  y = request.height - 2 * request.border_size - gfx->height - padding;
+	  x = 0;
+	  y = request.height - 2 * request.border_size - gfx->height;
 	}
 	else if (id == TOOL_CTRL_ID_NO)
 	{
-	  x = request.width  - 2 * request.border_size - gfx->width  - padding;
-	  y = request.height - 2 * request.border_size - gfx->height - padding;
+	  x = request.width  - 2 * request.border_size - gfx->width;
+	  y = request.height - 2 * request.border_size - gfx->height;
 	}
 	else if (id == TOOL_CTRL_ID_CONFIRM)
 	{
 	  x = (request.width - 2 * request.border_size - gfx->width) / 2;
-	  y = request.height - 2 * request.border_size - gfx->height - padding;
+	  y = request.height - 2 * request.border_size - gfx->height;
 	}
 	else if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4)
 	{
 	  int player_nr = id - TOOL_CTRL_ID_PLAYER_1;
 
 	  x = (request.width - 2 * request.border_size - gfx->width) / 2;
-	  y = request.height - 2 * request.border_size - gfx->height - padding;
+	  y = request.height - 2 * request.border_size - gfx->height * 2;
 
-	  x += (player_nr % 2 ? +1 : -1) * gfx->width / 2;
-	  y += (player_nr / 2 ?  0 : -1) * gfx->height;
+	  x += (player_nr == 3 ? -1 : player_nr == 1 ? +1 : 0) * gfx->width;
+	  y += (player_nr == 0 ? -1 : player_nr == 2 ? +1 : 0) * gfx->height;
 	}
       }
     }