projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981005-1
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 9f0ec9f9961e0b20bf30e76a834f05a6894b062f..cc78f0d8c52714197f368159db3fd0d58bc52775 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1,13
+1,12
@@
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* ©1995 Artsoft Development *
-* Holger Schemel *
-* 33659 Bielefeld-Senne *
-* Telefon: (0521) 493245 *
-* eMail: aeglos@valinor.owl.de *
-* aeglos@uni-paderborn.de *
-* q99492@pbhrzx.uni-paderborn.de *
+* (c) 1995-98 Artsoft Entertainment *
+* Holger Schemel *
+* Oststrasse 11a *
+* 33604 Bielefeld *
+* phone: ++49 +521 290471 *
+* email: aeglos@valinor.owl.de *
*----------------------------------------------------------*
* screens.c *
***********************************************************/
*----------------------------------------------------------*
* screens.c *
***********************************************************/
@@
-24,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);
@@
-69,7
+69,7
@@
void DrawMainMenu()
DrawGraphic(10,3,GFX_PFEIL_L);
DrawGraphic(14,3,GFX_PFEIL_R);
DrawGraphic(10,3,GFX_PFEIL_L);
DrawGraphic(14,3,GFX_PFEIL_R);
- DrawText(SX+
54+16,SY+326,"A Game by Artsoft Develop
ment",FS_SMALL,FC_BLUE);
+ DrawText(SX+
40+16,SY+326,"A Game by Artsoft Entertain
ment",FS_SMALL,FC_BLUE);
DrawText(SX+40+16,SY+344,"Graphics: Deluxe Paint IV Amiga",
FS_SMALL,FC_BLUE);
DrawText(SX+60+16,SY+362,"Sounds: AudioMaster IV Amiga",
DrawText(SX+40+16,SY+344,"Graphics: Deluxe Paint IV Amiga",
FS_SMALL,FC_BLUE);
DrawText(SX+60+16,SY+362,"Sounds: AudioMaster IV Amiga",
@@
-205,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)
@@
-215,11
+215,16
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
}
else if (y==8)
{
}
else if (y==8)
{
- if (autorecord_on)
- TapeStartRecording();
+ if (standalone)
+ {
+ if (autorecord_on)
+ TapeStartRecording();
- game_status = PLAYING;
- InitGame();
+ game_status = PLAYING;
+ InitGame();
+ }
+ else
+ SendToServer_StartPlaying();
}
else if (y==9)
{
}
else if (y==9)
{
@@
-229,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;
}
@@
-255,12
+260,12
@@
static int helpscreen_frame[MAX_HELPSCREEN_ELS];
static int helpscreen_delay[MAX_HELPSCREEN_ELS];
static int helpscreen_action[] =
{
static int helpscreen_delay[MAX_HELPSCREEN_ELS];
static int helpscreen_action[] =
{
- GFX_SPIELER_DOWN,4,2,
- GFX_SPIELER_UP,4,2,
- GFX_SPIELER_LEFT,4,2,
- GFX_SPIELER_RIGHT,4,2,
- GFX_SPIELER_PUSH_LEFT,4,2,
- GFX_SPIELER
_PUSH_RIGHT,4,2,
HA_NEXT,
+ GFX_SPIELER
1
_DOWN,4,2,
+ GFX_SPIELER
1
_UP,4,2,
+ GFX_SPIELER
1
_LEFT,4,2,
+ GFX_SPIELER
1
_RIGHT,4,2,
+ GFX_SPIELER
1
_PUSH_LEFT,4,2,
+ GFX_SPIELER
1_PUSH_RIGHT,4,2,
HA_NEXT,
GFX_ERDREICH,1,100, HA_NEXT,
GFX_LEERRAUM,1,100, HA_NEXT,
GFX_MORAST_LEER,1,100, HA_NEXT,
GFX_ERDREICH,1,100, HA_NEXT,
GFX_LEERRAUM,1,100, HA_NEXT,
GFX_MORAST_LEER,1,100, HA_NEXT,
@@
-1299,18
+1304,18
@@
void CalibrateJoystick()
DrawSetupScreen();
}
DrawSetupScreen();
}
-void HandleGameActions()
+void HandleGameActions(
byte player_action
)
{
if (game_status != PLAYING)
return;
{
if (game_status != PLAYING)
return;
- if (LevelSolved)
+ if (
local_player->
LevelSolved)
GameWon();
GameWon();
- if (
Player
Gone && !TAPE_IS_STOPPED(tape))
+ if (
AllPlayers
Gone && !TAPE_IS_STOPPED(tape))
TapeStop();
TapeStop();
- GameActions();
+ GameActions(
player_action
);
BackToFront();
}
BackToFront();
}
@@
-1328,7
+1333,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
{
@@
-1477,7
+1482,7
@@
void HandleGameButtons(int mx, int my, int button)
switch(CheckGameButtons(mx,my,button))
{
case BUTTON_GAME_STOP:
switch(CheckGameButtons(mx,my,button))
{
case BUTTON_GAME_STOP:
- if (
GameOver
)
+ if (
AllPlayersGone
)
{
CloseDoor(DOOR_CLOSE_1);
game_status = MAINMENU;
{
CloseDoor(DOOR_CLOSE_1);
game_status = MAINMENU;
@@
-1485,8
+1490,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();