rnd-20020324-1-src
[rocksndiamonds.git] / src / screens.c
index 2e206e2186ec05dffb3366cb2eed227a9e436bae..99cbd2eafe450e464fa46e9bdb3e38511aeb6ead 100644 (file)
@@ -1,27 +1,25 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2001 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  screens.c                                               *
+* screens.c                                                *
 ***********************************************************/
 
+#include "libgame/libgame.h"
+
 #include "screens.h"
 #include "events.h"
-#include "sound.h"
 #include "game.h"
 #include "tools.h"
 #include "editor.h"
-#include "misc.h"
 #include "files.h"
-#include "buttons.h"
 #include "tape.h"
-#include "joystick.h"
 #include "cartoons.h"
 #include "network.h"
 #include "init.h"
@@ -60,7 +58,30 @@ void DrawHeadline()
   int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2;
 
   DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW);
-  DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING);
+  DrawTextFCentered(46, FC_RED, WINDOW_SUBTITLE_STRING);
+}
+
+static void ToggleFullscreenIfNeeded()
+{
+  if (setup.fullscreen != video.fullscreen_enabled)
+  {
+    /* save old door content */
+    BlitBitmap(backbuffer, pix[PIX_DB_DOOR],
+              DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+
+    /* toggle fullscreen */
+    ChangeVideoModeIfNeeded(setup.fullscreen);
+    setup.fullscreen = video.fullscreen_enabled;
+
+    /* redraw background to newly created backbuffer */
+    BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
+
+    /* restore old door content */
+    BlitBitmap(pix[PIX_DB_DOOR], backbuffer,
+              DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
+
+    redraw_mask = REDRAW_ALL;
+  }
 }
 
 void DrawMainMenu()
@@ -72,6 +93,7 @@ void DrawMainMenu()
   UnmapAllGadgets();
   FadeSounds();
   KeyboardAutoRepeatOn();
+  ActivateJoystickIfAvailable();
 
   /* needed if last screen was the playing screen, invoked from level editor */
   if (level_editor_test_game)
@@ -84,6 +106,13 @@ void DrawMainMenu()
   /* needed if last screen was the editor screen */
   UndrawSpecialEditorDoor();
 
+  /* needed if last screen was the setup screen and fullscreen state changed */
+  ToggleFullscreenIfNeeded();
+
+#ifdef TARGET_SDL
+  SetDrawtoField(DRAW_BACKBUFFER);
+#endif
+
   /* map gadgets for main menu screen */
   MapTapeButtons();
 
@@ -256,9 +285,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
     level_nr = new_level_nr;
 
-    DrawTextExt(drawto, gc, SX + 11 * 32, SY + 3 * 32,
+    DrawTextExt(drawto, SX + 11 * 32, SY + 3 * 32,
                int2str(level_nr, 3), FS_BIG, font_color);
-    DrawTextExt(window, gc, SX + 11 * 32, SY + 3 * 32,
+    DrawTextExt(window, SX + 11 * 32, SY + 3 * 32,
                int2str(level_nr, 3), FS_BIG, font_color);
 
     LoadLevel(level_nr);
@@ -327,7 +356,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        if (setup.autorecord)
          TapeStartRecording();
 
-#if !defined(MSDOS) && !defined(WIN32)
+#if defined(PLATFORM_UNIX)
        if (options.network)
          SendToServer_StartPlaying();
        else
@@ -557,6 +586,7 @@ static char *helpscreen_music[][3] =
   { "Voyager",                 "The Alan Parsons Project","Pyramid" },
   { "Twilight Painter",                "Tangerine Dream",      "Heartbreakers" }
 };
+static int num_helpscreen_music = 7;
 static int helpscreen_musicpos;
 
 void DrawHelpScreenElAction(int start)
@@ -611,7 +641,7 @@ void DrawHelpScreenElAction(int start)
     }
     j++;
 
-    DrawGraphicExt(drawto, gc, xstart, ystart+(i-start)*ystep, graphic+frame);
+    DrawGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
     i++;
   }
 
@@ -671,7 +701,9 @@ void DrawHelpScreenMusicText(int num)
 
   DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
 
+#if 0
   PlaySoundLoop(background_loop[num]);
+#endif
 }
 
 void DrawHelpScreenCreditsText()
@@ -775,17 +807,20 @@ void HandleHelpScreen(int button)
       DrawHelpScreenElText(helpscreen_state*MAX_HELPSCREEN_ELS);
       DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
     }
-    else if (helpscreen_state < num_helpscreen_els_pages + num_bg_loops - 1)
+    else if (helpscreen_state <
+            num_helpscreen_els_pages + num_helpscreen_music - 1)
     {
       helpscreen_state++;
       DrawHelpScreenMusicText(helpscreen_state - num_helpscreen_els_pages);
     }
-    else if (helpscreen_state == num_helpscreen_els_pages + num_bg_loops - 1)
+    else if (helpscreen_state ==
+            num_helpscreen_els_pages + num_helpscreen_music - 1)
     {
       helpscreen_state++;
       DrawHelpScreenCreditsText();
     }
-    else if (helpscreen_state == num_helpscreen_els_pages + num_bg_loops)
+    else if (helpscreen_state ==
+            num_helpscreen_els_pages + num_helpscreen_music)
     {
       helpscreen_state++;
       DrawHelpScreenContactText();
@@ -822,33 +857,34 @@ void HandleTypeName(int newxpos, Key key)
     return;
   }
 
-  if (((key >= KEY_A && key <= KEY_Z) || (key >= KEY_a && key <= KEY_z)) && 
+  if (((key >= KSYM_A && key <= KSYM_Z) ||
+       (key >= KSYM_a && key <= KSYM_z)) && 
       xpos < MAX_PLAYER_NAME_LEN)
   {
     char ascii;
 
-    if (key >= KEY_A && key <= KEY_Z)
-      ascii = 'A' + (char)(key - KEY_A);
+    if (key >= KSYM_A && key <= KSYM_Z)
+      ascii = 'A' + (char)(key - KSYM_A);
     else
-      ascii = 'a' + (char)(key - KEY_a);
+      ascii = 'a' + (char)(key - KSYM_a);
 
     setup.player_name[xpos] = ascii;
     setup.player_name[xpos + 1] = 0;
     xpos++;
-    DrawTextExt(drawto, gc, SX + 6*32, SY + ypos*32,
+    DrawTextExt(drawto, SX + 6*32, SY + ypos*32,
                setup.player_name, FS_BIG, FC_YELLOW);
-    DrawTextExt(window, gc, SX + 6*32, SY + ypos*32,
+    DrawTextExt(window, SX + 6*32, SY + ypos*32,
                setup.player_name, FS_BIG, FC_YELLOW);
     DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
   }
-  else if ((key == KEY_Delete || key == KEY_BackSpace) && xpos > 0)
+  else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
   {
     xpos--;
     setup.player_name[xpos] = 0;
     DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
     DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM);
   }
-  else if (key == KEY_Return && xpos > 0)
+  else if (key == KSYM_Return && xpos > 0)
   {
     DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_RED);
     DrawGraphic(xpos + 6, ypos, GFX_LEERRAUM);
@@ -1013,7 +1049,8 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
                                 leveldir_current->cl_first);
 
     drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
-    drawChooseLevelInfo(leveldir_pos);
+    drawChooseLevelInfo(leveldir_current->cl_first +
+                       leveldir_current->cl_cursor - 3);
     redraw = TRUE;
   }
 
@@ -1036,7 +1073,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
     else
       x = y = 0;       /* no action */
 
-    if (ABS(dy) == SCR_FIELDY) /* handle KEY_Page_Up, KEY_Page_Down */
+    if (ABS(dy) == SCR_FIELDY) /* handle KSYM_Page_Up, KSYM_Page_Down */
     {
       dy = SIGN(dy);
       step = num_page_entries - 1;
@@ -1136,15 +1173,19 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
        node_cursor->cl_first = leveldir_current->cl_first;
        node_cursor->cl_cursor = leveldir_current->cl_cursor;
        leveldir_current = node_cursor->node_group;
+
        DrawChooseLevel();
       }
       else if (node_cursor->parent_link)
       {
        leveldir_current = node_cursor->node_parent;
+
        DrawChooseLevel();
       }
       else
       {
+       node_cursor->cl_first = leveldir_current->cl_first;
+       node_cursor->cl_cursor = leveldir_current->cl_cursor;
        leveldir_current = node_cursor;
 
        LoadLevelSetup_SeriesInfo();
@@ -1168,6 +1209,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 void DrawHallOfFame(int highlight_position)
 {
   UnmapAllGadgets();
+  FadeSounds();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0) 
@@ -1224,7 +1266,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
     return;
   }
 
-  if (ABS(dy) == SCR_FIELDY)   /* handle KEY_Page_Up, KEY_Page_Down */
+  if (ABS(dy) == SCR_FIELDY)   /* handle KSYM_Page_Up, KSYM_Page_Down */
     step = MAX_LEVEL_SERIES_ON_SCREEN - 1;
 
   if (dy < 0)
@@ -1283,7 +1325,10 @@ void DrawSetupScreen()
 #endif
     { &setup.scroll_delay,     "Scroll Delay:" },
     { &setup.soft_scrolling,   "Soft Scroll.:" },
+#if 0
     { &setup.fading,           "Fading:"       },
+#endif
+    { &setup.fullscreen,       "Fullscreen:"   },
     { &setup.quick_doors,      "Quick Doors:"  },
     { &setup.autorecord,       "Auto-Record:"  },
     { &setup.team_mode,                "Team-Mode:"    },
@@ -1399,7 +1444,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
     {
       int yy = y-1;
 
-      if (y==3 && sound_status==SOUND_AVAILABLE)
+      if (y == 3 && audio.sound_available)
       {
        if (setup.sound)
        {
@@ -1413,7 +1458,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.sound = !setup.sound;
       }
-      else if (y==4 && sound_loops_allowed)
+      else if (y == 4 && audio.loops_available)
       {
        if (setup.sound_loops)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1425,7 +1470,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
        }
        setup.sound_loops = !setup.sound_loops;
       }
-      else if (y==5 && sound_loops_allowed)
+      else if (y == 5 && audio.loops_available)
       {
        if (setup.sound_music)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1439,7 +1484,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
       }
 
 #if 0
-      else if (y==6)
+      else if (y == 6)
       {
        if (setup.toons)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1447,7 +1492,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.toons = !setup.toons;
       }
-      else if (y==7)
+      else if (y == 7)
       {
 #if 0
        if (setup.double_buffering)
@@ -1464,7 +1509,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
       }
 #endif
 
-      else if (y==6)
+      else if (y == 6)
       {
        if (setup.scroll_delay)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1472,7 +1517,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.scroll_delay = !setup.scroll_delay;
       }
-      else if (y==7)
+      else if (y == 7)
       {
        if (setup.soft_scrolling)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1480,7 +1525,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.soft_scrolling = !setup.soft_scrolling;
       }
-      else if (y==8)
+#if 0
+      else if (y == 8)
       {
        if (setup.fading)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1488,7 +1534,16 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.fading = !setup.fading;
       }
-      else if (y==9)
+#endif
+      else if (y == 8 && video.fullscreen_available)
+      {
+       if (setup.fullscreen)
+         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
+       else
+         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
+       setup.fullscreen = !setup.fullscreen;
+      }
+      else if (y == 9)
       {
        if (setup.quick_doors)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1496,7 +1551,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.quick_doors = !setup.quick_doors;
       }
-      else if (y==10)
+      else if (y == 10)
       {
        if (setup.autorecord)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1504,7 +1559,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.autorecord = !setup.autorecord;
       }
-      else if (y==11)
+      else if (y == 11)
       {
        if (setup.team_mode)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1512,7 +1567,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.team_mode = !setup.team_mode;
       }
-      else if (y==12)
+      else if (y == 12)
       {
        if (setup.handicap)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1520,7 +1575,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.handicap = !setup.handicap;
       }
-      else if (y==13)
+      else if (y == 13)
       {
        if (setup.time_limit)
          DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1528,29 +1583,17 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
          DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
        setup.time_limit = !setup.time_limit;
       }
-      else if (y==14)
+      else if (y == 14)
       {
        game_status = SETUPINPUT;
        DrawSetupInputScreen();
        redraw = TRUE;
       }
-      else if (y==pos_end-1 || y==pos_end)
+      else if (y == pos_end - 1 || y == pos_end)
       {
-        if (y==pos_end)
-       {
+        if (y == pos_end)
          SaveSetup();
 
-         /*
-         SaveJoystickData();
-         */
-
-#ifdef MSDOS
-         save_joystick_data(JOYSTICK_FILENAME);
-#endif
-
-
-       }
-
        game_status = MAINMENU;
        DrawMainMenu();
        redraw = TRUE;
@@ -1580,6 +1623,7 @@ void DrawSetupInputScreen()
   DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
   DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
 
+  DeactivateJoystickForCalibration();
   DrawTextFCentered(SYSIZE - 20, FC_BLUE,
                    "Joysticks deactivated on this screen");
 
@@ -1605,7 +1649,8 @@ static void setJoystickDeviceToNr(char *device_name, int device_nr)
       device_name[strlen(device_name) - 1] = '0' + (char)(device_nr % 10);
   }
   else
-    strncpy(device_name, joystick_device_name[device_nr], strlen(device_name));
+    strncpy(device_name, getDeviceNameFromJoystickNr(device_nr),
+           strlen(device_name));
 }
 
 static void drawPlayerSetupInputInfo(int player_nr)
@@ -1788,30 +1833,6 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
            setJoystickDeviceToNr(device_name, new_device_nr);
        }
 
-
-       /*
-       InitJoysticks();
-       */
-
-
-#if 0
-       int one_joystick_nr       = (dx >= 0 ? 0 : 1);
-       int the_other_joystick_nr = (dx >= 0 ? 1 : 0);
-
-       if (setup.input[player_nr].use_joystick)
-       {
-         if (setup.input[player_nr].joystick_nr == one_joystick_nr)
-           setup.input[player_nr].joystick_nr = the_other_joystick_nr;
-         else
-           setup.input[player_nr].use_joystick = FALSE;
-       }
-       else
-       {
-         setup.input[player_nr].use_joystick = TRUE;
-         setup.input[player_nr].joystick_nr = one_joystick_nr;
-       }
-#endif
-
        drawPlayerSetupInputInfo(player_nr);
       }
       else if (y == 5)
@@ -1898,7 +1919,7 @@ void CustomizeKeyboard(int player_nr)
          {
            Key key = GetEventKey((KeyEvent *)&event, TRUE);
 
-           if (key == KEY_Escape || (key == KEY_Return && step_nr == 6))
+           if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
            {
              finished = TRUE;
              break;
@@ -1909,7 +1930,7 @@ void CustomizeKeyboard(int player_nr)
              break;
 
            /* press 'Enter' to keep the existing key binding */
-           if (key == KEY_Return)
+           if (key == KSYM_Return)
              key = *customize_step[step_nr].key;
 
            /* check if key already used */
@@ -1976,56 +1997,29 @@ void CustomizeKeyboard(int player_nr)
   DrawSetupInputScreen();
 }
 
-void CalibrateJoystick(int player_nr)
+static boolean CalibrateJoystickMain(int player_nr)
 {
-#ifdef __FreeBSD__
-  struct joystick joy_ctrl;
-#else
-  struct joystick_control
-  {
-    int buttons;
-    int x;
-    int y;
-  } joy_ctrl;
-#endif
-
-#ifndef MSDOS
-  int new_joystick_xleft = 128, new_joystick_xright = 128;
-  int new_joystick_yupper = 128, new_joystick_ylower = 128;
+  int new_joystick_xleft = JOYSTICK_XMIDDLE;
+  int new_joystick_xright = JOYSTICK_XMIDDLE;
+  int new_joystick_yupper = JOYSTICK_YMIDDLE;
+  int new_joystick_ylower = JOYSTICK_YMIDDLE;
   int new_joystick_xmiddle, new_joystick_ymiddle;
-#else
-  int calibration_step = 1;
-#endif
 
-  int joystick_fd = stored_player[player_nr].joystick_fd;
+  int joystick_fd = joystick.fd[player_nr];
   int x, y, last_x, last_y, xpos = 8, ypos = 3;
   boolean check[3][3];
-  int check_remaining;
+  int check_remaining = 3 * 3;
+  int joy_x, joy_y;
   int joy_value;
   int result = -1;
 
-  if (joystick_status == JOYSTICK_OFF ||
-      joystick_fd < 0 ||
-      !setup.input[player_nr].use_joystick)
-    goto error_out;
+  if (joystick.status == JOYSTICK_NOT_AVAILABLE)
+    return FALSE;
 
-  ClearWindow();
+  if (joystick_fd < 0 || !setup.input[player_nr].use_joystick)
+    return FALSE;
 
-#ifndef MSDOS
-  DrawText(SX,      SY +  6*32, " ROTATE JOYSTICK ", FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY +  7*32, "IN ALL DIRECTIONS", FS_BIG, FC_YELLOW);
-  DrawText(SX + 16, SY +  9*32, "  IF ALL BALLS  ",  FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 10*32, "   ARE YELLOW,   ", FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
-  check_remaining = 3 * 3;
-#else
-  DrawText(SX,      SY +  7*32, "  MOVE JOYSTICK  ", FS_BIG, FC_YELLOW);
-  DrawText(SX + 16, SY +  8*32, "       TO       ",  FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY +  9*32, " CENTER POSITION ",  FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 10*32, "       AND       ", FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
-  check_remaining = 0;
-#endif
+  ClearWindow();
 
   for(y=0; y<3; y++)
   {
@@ -2036,21 +2030,29 @@ void CalibrateJoystick(int player_nr)
     }
   }
 
+  DrawText(SX,      SY +  6 * 32, " ROTATE JOYSTICK ", FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY +  7 * 32, "IN ALL DIRECTIONS", FS_BIG, FC_YELLOW);
+  DrawText(SX + 16, SY +  9 * 32, "  IF ALL BALLS  ",  FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY + 10 * 32, "   ARE YELLOW,   ", FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY + 11 * 32, " CENTER JOYSTICK ", FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY + 12 * 32, "       AND       ", FS_BIG, FC_YELLOW);
+  DrawText(SX,      SY + 13 * 32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
+
   joy_value = Joystick(player_nr);
   last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0);
   last_y = (joy_value & JOY_UP   ? -1 : joy_value & JOY_DOWN  ? +1 : 0);
-  DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT);
 
-  BackToFront();
+  /* eventually uncalibrated center position (joystick could be uncentered) */
+  if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL))
+    return FALSE;
 
-#ifdef __FreeBSD__
-  joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
-  joy_ctrl.buttons = 0;
-#endif
+  new_joystick_xmiddle = joy_x;
+  new_joystick_ymiddle = joy_y;
 
-  while(Joystick(player_nr) & JOY_BUTTON);
+  DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT);
+  BackToFront();
 
+  while(Joystick(player_nr) & JOY_BUTTON);     /* wait for released button */
   InitAnimation();
 
   while(result < 0)
@@ -2066,12 +2068,12 @@ void CalibrateJoystick(int player_nr)
        case EVENT_KEYPRESS:
          switch(GetEventKey((KeyEvent *)&event, TRUE))
          {
-           case KEY_Return:
+           case KSYM_Return:
              if (check_remaining == 0)
                result = 1;
              break;
 
-           case KEY_Escape:
+           case KSYM_Escape:
              result = 0;
              break;
 
@@ -2090,28 +2092,13 @@ void CalibrateJoystick(int player_nr)
       }
     }
 
-#ifndef MSDOS
+    if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL))
+      return FALSE;
 
-#ifdef USE_SDL_LIBRARY
-    joy_ctrl.x = Get_SDL_Joystick_Axis(joystick_fd, 0);
-    joy_ctrl.y = Get_SDL_Joystick_Axis(joystick_fd, 1);
-#else
-    if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
-    {
-      joystick_status = JOYSTICK_OFF;
-      goto error_out;
-    }
-#endif
-
-    new_joystick_xleft  = MIN(new_joystick_xleft,  joy_ctrl.x);
-    new_joystick_xright = MAX(new_joystick_xright, joy_ctrl.x);
-    new_joystick_yupper = MIN(new_joystick_yupper, joy_ctrl.y);
-    new_joystick_ylower = MAX(new_joystick_ylower, joy_ctrl.y);
-
-    new_joystick_xmiddle =
-      new_joystick_xleft + (new_joystick_xright - new_joystick_xleft) / 2;
-    new_joystick_ymiddle =
-      new_joystick_yupper + (new_joystick_ylower - new_joystick_yupper) / 2;
+    new_joystick_xleft  = MIN(new_joystick_xleft,  joy_x);
+    new_joystick_xright = MAX(new_joystick_xright, joy_x);
+    new_joystick_yupper = MIN(new_joystick_yupper, joy_y);
+    new_joystick_ylower = MAX(new_joystick_ylower, joy_y);
 
     setup.input[player_nr].joy.xleft = new_joystick_xleft;
     setup.input[player_nr].joy.yupper = new_joystick_yupper;
@@ -2121,60 +2108,18 @@ void CalibrateJoystick(int player_nr)
     setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle;
 
     CheckJoystickData();
-#endif
 
     joy_value = Joystick(player_nr);
 
     if (joy_value & JOY_BUTTON && check_remaining == 0)
-    {
       result = 1;
 
-#ifdef MSDOS
-      if (calibration_step == 1)
-      {
-       remove_joystick();
-       InitJoysticks();
-      }
-      else if (calibrate_joystick(joystick_fd) != 0)
-      {
-       joystick_status = JOYSTICK_OFF;
-       goto error_out;
-      }
-
-      if (joy[joystick_fd].flags & JOYFLAG_CALIBRATE)
-      {
-       calibration_step++;
-       result = -1;
-
-       DrawText(SX,      SY +  7*32, "  MOVE JOYSTICK  ", FS_BIG, FC_YELLOW);
-       DrawText(SX + 16, SY +  8*32, "       TO       ",  FS_BIG, FC_YELLOW);
-
-       if (calibration_step == 2)
-         DrawText(SX + 16, SY + 9*32," THE UPPER LEFT ",  FS_BIG, FC_YELLOW);
-       else
-         DrawText(SX,      SY + 9*32," THE LOWER RIGHT ", FS_BIG, FC_YELLOW);
-
-       DrawText(SX,      SY + 10*32, "       AND       ", FS_BIG, FC_YELLOW);
-       DrawText(SX,      SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
-
-       BackToFront();
-
-       while(Joystick(player_nr) & JOY_BUTTON)
-         DoAnimation();
-      }
-#endif
-    }
-
     x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0);
     y = (joy_value & JOY_UP   ? -1 : joy_value & JOY_DOWN  ? +1 : 0);
 
     if (x != last_x || y != last_y)
     {
-#ifndef MSDOS
       DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_GELB);
-#else
-      DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_BLAU);
-#endif
       DrawGraphic(xpos + x,      ypos + y,      GFX_KUGEL_ROT);
 
       last_x = x;
@@ -2187,6 +2132,7 @@ void CalibrateJoystick(int player_nr)
       }
 
 #if 0
+#ifdef DEBUG
       printf("LEFT / MIDDLE / RIGHT == %d / %d / %d\n",
             setup.input[player_nr].joy.xleft,
             setup.input[player_nr].joy.xmiddle,
@@ -2195,6 +2141,7 @@ void CalibrateJoystick(int player_nr)
             setup.input[player_nr].joy.yupper,
             setup.input[player_nr].joy.ymiddle,
             setup.input[player_nr].joy.ylower);
+#endif
 #endif
 
     }
@@ -2206,12 +2153,19 @@ void CalibrateJoystick(int player_nr)
     Delay(10);
   }
 
+  /* calibrated center position (joystick should now be centered) */
+  if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL))
+    return FALSE;
+
+  new_joystick_xmiddle = joy_x;
+  new_joystick_ymiddle = joy_y;
+
   StopAnimation();
 
   DrawSetupInputScreen();
 
   /* wait until the last pressed button was released */
-  while(Joystick(player_nr) & JOY_BUTTON)
+  while (Joystick(player_nr) & JOY_BUTTON)
   {
     if (PendingEvent())                /* got event */
     {
@@ -2223,16 +2177,21 @@ void CalibrateJoystick(int player_nr)
       Delay(10);
     }
   }
-  return;
 
-  error_out:
+  return TRUE;
+}
 
-  ClearWindow();
-  DrawText(SX + 16, SY + 6*32, "  JOYSTICK NOT  ", FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 7*32, "    AVAILABLE    ", FS_BIG, FC_YELLOW);
-  BackToFront();
-  Delay(2000);
-  DrawSetupInputScreen();
+void CalibrateJoystick(int player_nr)
+{
+  if (!CalibrateJoystickMain(player_nr))
+  {
+    ClearWindow();
+
+    DrawText(SX + 16, SY + 6*32, "  JOYSTICK NOT  ",  FS_BIG, FC_YELLOW);
+    DrawText(SX,      SY + 7*32, "    AVAILABLE    ", FS_BIG, FC_YELLOW);
+    BackToFront();
+    Delay(2000);       /* show error message for two seconds */
+  }
 }
 
 void HandleGameActions()
@@ -2317,7 +2276,7 @@ static struct
 
 static void CreateScreenScrollbuttons()
 {
-  Bitmap gd_bitmap = pix[PIX_MORE];
+  Bitmap *gd_bitmap = pix[PIX_MORE];
   struct GadgetInfo *gi;
   unsigned long event_mask;
   int i;
@@ -2371,7 +2330,7 @@ static void CreateScreenScrollbars()
   for (i=0; i<NUM_SCREEN_SCROLLBARS; i++)
   {
     int id = scrollbar_info[i].gadget_id;
-    Bitmap gd_bitmap = pix[PIX_MORE];
+    Bitmap *gd_bitmap = pix[PIX_MORE];
     int gd_x1, gd_x2, gd_y1, gd_y2;
     struct GadgetInfo *gi;
     int items_max, items_visible, item_position;