projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981010-1
[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 "tape.h"
#include "joystick.h"
#include "cartoons.h"
+#include "network.h"
#ifdef MSDOS
extern unsigned char get_ascii(KeySym);
#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)
{
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)
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();
if (autorecord_on)
TapeStartRecording();
- game_status = PLAYING;
- InitGame();
+ if (standalone)
+ {
+ game_status = PLAYING;
+ InitGame();
+ }
+ else
+ SendToServer_StartPlaying();
}
else if (y==9)
{
}
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);
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;
}
game_status = EXITGAME;
}
@@
-679,7
+685,9
@@
void CheckCheat()
{
int old_handicap = local_player->handicap;
{
int old_handicap = local_player->handicap;
+#if 0
if (!strcmp(local_player->alias_name,"Artsoft"))
if (!strcmp(local_player->alias_name,"Artsoft"))
+#endif
local_player->handicap = leveldir[leveldir_nr].levels-1;
if (local_player->handicap != old_handicap)
local_player->handicap = leveldir[leveldir_nr].levels-1;
if (local_player->handicap != old_handicap)
@@
-1298,7
+1306,7
@@
void CalibrateJoystick()
DrawSetupScreen();
}
DrawSetupScreen();
}
-void HandleGameActions(
int
player_action)
+void HandleGameActions(
byte
player_action)
{
if (game_status != PLAYING)
return;
{
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))
{
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
{
}
else
{
@@
-1347,8
+1355,14
@@
void HandleVideoButtons(int mx, int my, int button)
if (TAPE_IS_STOPPED(tape))
{
TapeStartRecording();
if (TAPE_IS_STOPPED(tape))
{
TapeStartRecording();
- game_status = PLAYING;
- InitGame();
+
+ if (standalone)
+ {
+ game_status = PLAYING;
+ InitGame();
+ }
+ else
+ SendToServer_StartPlaying();
}
else if (tape.pausing)
{
}
else if (tape.pausing)
{
@@
-1372,8
+1386,14
@@
void HandleVideoButtons(int mx, int my, int button)
if (TAPE_IS_STOPPED(tape))
{
TapeStartPlaying();
if (TAPE_IS_STOPPED(tape))
{
TapeStartPlaying();
- game_status = PLAYING;
- InitGame();
+
+ if (standalone)
+ {
+ game_status = PLAYING;
+ InitGame();
+ }
+ else
+ SendToServer_StartPlaying();
}
else if (tape.playing)
{
}
else if (tape.playing)
{
@@
-1484,8
+1504,8
@@
void HandleGameButtons(int mx, int my, int button)
break;
}
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();
{
game_status = MAINMENU;
DrawMainMenu();