X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=34625ee664c158276e1dc3881ed654218ec2ca8d;hb=e1b41b2f82ff880a45aeee124df01f0355f6583a;hp=33df999e188698611fa0a938fe74939d8a4a8dcb;hpb=3208b9ddd1f192865fee6d0be81c8bf7283ae00f;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 33df999e..34625ee6 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -6255,7 +6255,12 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
     "Joystick3",
     "Joystick4"
   };
-  int text_font_nr = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
+  int font_nr_menu = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
+  int font_nr_info = FONT_MENU_1;
+  int font_nr_name = FONT_VALUE_OLD;
+  int font_nr_on   = FONT_VALUE_1;
+  int font_nr_off  = FONT_VALUE_OLD;
+  int pos = 4;
 
   custom_key = setup.input[player_nr].key;
 
@@ -6273,41 +6278,41 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
     int joystick_nr = getJoystickNrFromDeviceName(device_name);
     boolean joystick_active = CheckJoystickOpened(joystick_nr);
     char *text = joystick_name[joystick_nr];
-    int font_nr = (joystick_active ? FONT_VALUE_1 : FONT_VALUE_OLD);
+    int font_nr = (joystick_active ? font_nr_on : font_nr_off);
 
     DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr);
-    DrawText(mSX + 32, mSY + 4 * 32, "Configure", text_font_nr);
+    DrawText(mSX + 32, mSY + 4 * 32, "Configure", font_nr_menu);
   }
   else
   {
-    DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", FONT_VALUE_1);
-    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", text_font_nr);
+    DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", font_nr_on);
+    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", font_nr_menu);
   }
 
-  DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", font_nr_info);
 
-  drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT);
-  drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT);
-  drawCursorXY(1, 6, IMG_MENU_BUTTON_UP);
-  drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN);
+  drawCursorXY(1, pos + 0, IMG_MENU_BUTTON_LEFT);
+  drawCursorXY(1, pos + 1, IMG_MENU_BUTTON_RIGHT);
+  drawCursorXY(1, pos + 2, IMG_MENU_BUTTON_UP);
+  drawCursorXY(1, pos + 3, IMG_MENU_BUTTON_DOWN);
 
-  DrawText(mSX + 2 * 32, mSY +  6 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 2 * 32, mSY +  7 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 2 * 32, mSY +  8 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 2 * 32, mSY +  9 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 1 * 32, mSY + 10 * 32, "Snap Field:", FONT_VALUE_OLD);
-  DrawText(mSX + 1 * 32, mSY + 12 * 32, "Drop Element:", FONT_VALUE_OLD);
+  DrawText(mSX + 2 * 32, mSY + (pos + 2) * 32, ":", font_nr_name);
+  DrawText(mSX + 2 * 32, mSY + (pos + 3) * 32, ":", font_nr_name);
+  DrawText(mSX + 2 * 32, mSY + (pos + 4) * 32, ":", font_nr_name);
+  DrawText(mSX + 2 * 32, mSY + (pos + 5) * 32, ":", font_nr_name);
+  DrawText(mSX + 1 * 32, mSY + (pos + 6) * 32, "Snap Field:", font_nr_name);
+  DrawText(mSX + 1 * 32, mSY + (pos + 8) * 32, "Drop Element:", font_nr_name);
 
   for (i = 0; i < 6; i++)
   {
-    int ypos = 6 + i + (i > 3 ? i-3 : 0);
+    int ypos = (pos + 2) + i + (i > 3 ? i - 3 : 0);
 
     DrawText(mSX + 3 * 32, mSY + ypos * 32,
-	     "              ", FONT_VALUE_1);
+	     "              ", font_nr_on);
     DrawText(mSX + 3 * 32, mSY + ypos * 32,
 	     (setup.input[player_nr].use_joystick ?
 	      custom[i].text :
-	      getKeyNameFromKey(*custom[i].key)), FONT_VALUE_1);
+	      getKeyNameFromKey(*custom[i].key)), font_nr_on);
   }
 }
 
@@ -6463,6 +6468,8 @@ static boolean CustomizeKeyboardMain(int player_nr)
     { &custom_key.snap,  "Snap Field"	},
     { &custom_key.drop,  "Drop Element"	}
   };
+  int font_nr_old = FONT_VALUE_OLD;
+  int font_nr_new = FONT_VALUE_1;
   int success = FALSE;
 
   /* read existing key bindings from player setup */
@@ -6481,7 +6488,7 @@ static boolean CustomizeKeyboardMain(int player_nr)
   DrawText(mSX, mSY + (2 + 2 * step_nr + 1) * 32,
 	   "Key:", FONT_INPUT_1_ACTIVE);
   DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
-	   getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
+	   getKeyNameFromKey(*customize_step[step_nr].key), font_nr_old);
 
   FadeIn(REDRAW_FIELD);
 
@@ -6521,9 +6528,9 @@ static boolean CustomizeKeyboardMain(int player_nr)
 	    /* got new key binding */
 	    *customize_step[step_nr].key = key;
 	    DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
-		     "             ", FONT_VALUE_1);
+		     "             ", font_nr_new);
 	    DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
-		     getKeyNameFromKey(key), FONT_VALUE_1);
+		     getKeyNameFromKey(key), font_nr_new);
 	    step_nr++;
 
 	    /* un-highlight last query */
@@ -6548,7 +6555,7 @@ static boolean CustomizeKeyboardMain(int player_nr)
 		     "Key:", FONT_INPUT_1_ACTIVE);
 	    DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
 		     getKeyNameFromKey(*customize_step[step_nr].key),
-		     FONT_VALUE_OLD);
+		     font_nr_old);
 	  }
 	  break;
 
@@ -6578,8 +6585,10 @@ void CustomizeKeyboard(int player_nr)
 
   if (success)
   {
-    int xpos = mSX - SX;
-    int ypos = mSY - SY;
+    int font_nr = FONT_TITLE_1;
+    int font_height = getFontHeight(font_nr);
+    int ypos1 = SYSIZE / 2 - font_height * 2;
+    int ypos2 = SYSIZE / 2 - font_height * 1;
     unsigned int wait_frame_delay = 0;
     unsigned int wait_frame_delay_value = 2000;
 
@@ -6587,8 +6596,8 @@ void CustomizeKeyboard(int player_nr)
 
     ClearField();
 
-    DrawTextS(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, "    KEYBOARD    ");
-    DrawTextS(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, " IS CONFIGURED! ");
+    DrawTextSCentered(ypos1, font_nr, "Keyboard");
+    DrawTextSCentered(ypos2, font_nr, "configured!");
 
     while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
       BackToFront();
@@ -7006,11 +7015,14 @@ void ConfigureJoystick(int player_nr)
   if (state != JOYSTICK_NOT_CONFIGURED)
   {
     boolean success = (state == JOYSTICK_CONFIGURED);
-    char *message = (success ? " IS CONFIGURED! " : " NOT AVAILABLE! ");
+    char message1[MAX_OUTPUT_LINESIZE + 1];
+    char *message2 = (success ? "configured!" : "not available!");
     char *device_name = setup.input[player_nr].joy.device_name;
     int nr = getJoystickNrFromDeviceName(device_name) + 1;
-    int xpos = mSX - SX;
-    int ypos = mSY - SY;
+    int font_nr = FONT_TITLE_1;
+    int font_height = getFontHeight(font_nr);
+    int ypos1 = SYSIZE / 2 - font_height * 2;
+    int ypos2 = SYSIZE / 2 - font_height * 1;
     unsigned int wait_frame_delay = 0;
     unsigned int wait_frame_delay_value = 2000;
 
@@ -7018,8 +7030,10 @@ void ConfigureJoystick(int player_nr)
 
     ClearField();
 
-    DrawTextF(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, "   JOYSTICK %d   ", nr);
-    DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, message);
+    sprintf(message1, "Joystick %d", nr);
+
+    DrawTextSCentered(ypos1, font_nr, message1);
+    DrawTextSCentered(ypos2, font_nr, message2);
 
     while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
       BackToFront();