rnd-20000815-1-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 948f1ceb73602a5bbdfda6c0c2161be133678c15..2e206e2186ec05dffb3366cb2eed227a9e436bae 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -327,7 +327,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        if (setup.autorecord)
          TapeStartRecording();
 
-#ifndef MSDOS
+#if !defined(MSDOS) && !defined(WIN32)
        if (options.network)
          SendToServer_StartPlaying();
        else
@@ -686,7 +686,7 @@ void DrawHelpScreenCreditsText()
   DrawTextFCentered(100, FC_GREEN,
                    "Credits:");
   DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
-                   "DOS/Windows port of the game:");
+                   "DOS port of the game:");
   DrawTextFCentered(ystart + 1 * ystep, FC_RED,
                    "Guido Schulz");
   DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW,
@@ -716,13 +716,13 @@ void DrawHelpScreenContactText()
   DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW,
                    "If you like it, send e-mail to:");
   DrawTextFCentered(ystart + 2 * ystep, FC_RED,
-                   "aeglos@valinor.owl.de");
+                   "info@artsoft.org");
   DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW,
                    "or SnailMail to:");
   DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED,
                    "Holger Schemel");
   DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED,
-                   "Oststrasse 11a");
+                   "Detmolder Strasse 189");
   DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED,
                    "33604 Bielefeld");
   DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED,
@@ -1904,8 +1904,12 @@ void CustomizeKeyboard(int player_nr)
              break;
            }
 
+           /* all keys configured -- wait for "Escape" or "Return" key */
+           if (step_nr == 6)
+             break;
+
            /* press 'Enter' to keep the existing key binding */
-           if (key == KEY_Return || step_nr == 6)
+           if (key == KEY_Return)
              key = *customize_step[step_nr].key;
 
            /* check if key already used */
@@ -2215,6 +2219,8 @@ void CalibrateJoystick(int player_nr)
 
       NextEvent(&event);
       HandleOtherEvents(&event);
+
+      Delay(10);
     }
   }
   return;