rnd-19981006-2

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 86a1235d1549547c18ff94da1a756e22e5dd7862..bc9412d2a3422b3f748ce15074d64dd54542befd 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -23,6 +23,7 @@
 #include "tape.h"
 #include "joystick.h"
 #include "cartoons.h"
+#include "network.h"
 
 #ifdef MSDOS
 extern unsigned char get_ascii(KeySym);
@@ -204,7 +205,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       {
        game_status = LEVELED;
        if (leveldir[leveldir_nr].readonly)
-         AreYouSure("This level is read only !",AYS_CONFIRM);
+         Request("This level is read only !",REQ_CONFIRM);
        DrawLevelEd();
       }
       else if (y==7)
@@ -217,8 +218,13 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        if (autorecord_on)
          TapeStartRecording();
 
-       game_status = PLAYING;
-       InitGame();
+       if (standalone)
+       {
+         game_status = PLAYING;
+         InitGame();
+       }
+       else
+         SendToServer_StartPlaying();
       }
       else if (y==9)
       {
@@ -228,7 +234,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       else if (y==10)
       {
        SavePlayerInfo(PLAYER_LEVEL);
-        if (AreYouSure("Do you really want to quit ?",AYS_ASK|AYS_STAY_CLOSED))
+        if (Request("Do you really want to quit ?",REQ_ASK|REQ_STAY_CLOSED))
          game_status = EXITGAME;
       }
 
@@ -679,7 +685,9 @@ void CheckCheat()
 {
   int old_handicap = local_player->handicap;
 
+#if 0
   if (!strcmp(local_player->alias_name,"Artsoft"))
+#endif
     local_player->handicap = leveldir[leveldir_nr].levels-1;
 
   if (local_player->handicap != old_handicap)
@@ -1298,7 +1306,7 @@ void CalibrateJoystick()
   DrawSetupScreen();
 }
 
-void HandleGameActions(int player_action)
+void HandleGameActions(byte player_action)
 {
   if (game_status != PLAYING)
     return;
@@ -1327,7 +1335,7 @@ void HandleVideoButtons(int mx, int my, int button)
       {
        LoadLevelTape(level_nr);
        if (TAPE_IS_EMPTY(tape))
-         AreYouSure("No tape for this level !",AYS_CONFIRM);
+         Request("No tape for this level !",REQ_CONFIRM);
       }
       else
       {
@@ -1347,8 +1355,14 @@ void HandleVideoButtons(int mx, int my, int button)
       if (TAPE_IS_STOPPED(tape))
       {
        TapeStartRecording();
-       game_status = PLAYING;
-       InitGame();
+
+       if (standalone)
+       {
+         game_status = PLAYING;
+         InitGame();
+       }
+       else
+         SendToServer_StartPlaying();
       }
       else if (tape.pausing)
       {
@@ -1372,8 +1386,14 @@ void HandleVideoButtons(int mx, int my, int button)
       if (TAPE_IS_STOPPED(tape))
       {
        TapeStartPlaying();
-       game_status = PLAYING;
-       InitGame();
+
+       if (standalone)
+       {
+         game_status = PLAYING;
+         InitGame();
+       }
+       else
+         SendToServer_StartPlaying();
       }
       else if (tape.playing)
       {
@@ -1484,8 +1504,8 @@ void HandleGameButtons(int mx, int my, int button)
        break;
       }
 
-      if (AreYouSure("Do you really want to quit the game ?",
-                     AYS_ASK | AYS_STAY_CLOSED))
+      if (Request("Do you really want to quit the game ?",
+                 REQ_ASK | REQ_STAY_CLOSED))
       { 
        game_status = MAINMENU;
        DrawMainMenu();