/***********************************************************
* 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 *
*----------------------------------------------------------*
* tools.c *
***********************************************************/
#include "buttons.h"
#include "joystick.h"
#include "cartoons.h"
+#include "network.h"
#include <math.h>
#ifdef MSDOS
-extern BOOL wait_for_vsync;
+extern boolean wait_for_vsync;
#endif
void SetDrawtoField(int mode)
{
- if (mode == DRAW_BUFFERED && soft_scrolling_on)
+ if (mode == DRAW_BUFFERED && setup.soft_scrolling_on)
{
FX = TILEX;
FY = TILEY;
int x,y;
Drawable buffer = (drawto_field != window ? drawto_field : backbuffer);
- if (direct_draw_on && game_status == PLAYING)
+ if (setup.direct_draw_on && game_status == PLAYING)
redraw_mask &= ~REDRAW_MAIN;
if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
redraw_mask |= REDRAW_FIELD;
- if (redraw_mask & REDRAW_FIELD || ScreenMovPos)
+ if (redraw_mask & REDRAW_FIELD || ScreenGfxPos)
redraw_mask &= ~REDRAW_TILES;
if (!redraw_mask)
{
int fx = FX, fy = FY;
- if (soft_scrolling_on)
+ if (setup.soft_scrolling_on)
{
- fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
- fy += (PlayerMovDir & (MV_UP|MV_DOWN) ? ScreenMovPos : 0);
+ fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
+ fy += (ScreenMovDir & (MV_UP|MV_DOWN) ? ScreenGfxPos : 0);
}
XCopyArea(display,buffer,window,gc,
/*
long fading_delay = 300;
- if (fading_on && (redraw_mask & REDRAW_FIELD))
+ if (setup.fading_on && (redraw_mask & REDRAW_FIELD))
{
*/
XFillRectangle(display,backbuffer,gc,
REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
- if (soft_scrolling_on && game_status==PLAYING)
+ if (setup.soft_scrolling_on && game_status==PLAYING)
{
XFillRectangle(display,fieldbuffer,gc,
0,0, FXSIZE,FYSIZE);
else
SetDrawtoField(DRAW_BACKBUFFER);
- if (direct_draw_on && game_status==PLAYING)
+ if (setup.direct_draw_on && game_status==PLAYING)
{
XFillRectangle(display,window,gc,
REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
}
}
-void DrawPlayerField()
+void DrawAllPlayers()
{
- int x = JX, y = JY;
- int sx = SCROLLX(x), sy = SCROLLY(y);
+ int i;
- int sxx = 0, syy = 0;
+ for(i=0; i<MAX_PLAYERS; i++)
+ if (stored_player[i].active)
+ DrawPlayer(&stored_player[i]);
+}
+
+void DrawPlayerField(int x, int y)
+{
+ if (!IS_PLAYER(x,y))
+ return;
- int element = Feld[x][y];
+ DrawPlayer(PLAYERINFO(x,y));
+}
+
+void DrawPlayer(struct PlayerInfo *player)
+{
+ int jx = player->jx, jy = player->jy;
+ int last_jx = player->last_jx, last_jy = player->last_jy;
+ int next_jx = jx + (jx - last_jx), next_jy = jy + (jy - last_jy);
+ int sx = SCREENX(jx), sy = SCREENY(jy);
+ int sxx = 0, syy = 0;
+ int element = Feld[jx][jy];
int graphic, phase;
- if (PlayerGone)
+ /*
+ if (!player->active || player->gone || !IN_SCR_FIELD(sx,sy))
+ return;
+ */
+
+ if (!player->active || player->gone ||
+ !IN_SCR_FIELD(SCREENX(last_jx),SCREENY(last_jy)))
return;
#if DEBUG
- if (!IN_LEV_FIELD(x,y) || !IN_SCR_FIELD(sx,sy))
+ if (!IN_LEV_FIELD(jx,jy))
{
- printf("DrawPlayerField(): x = %d, y = %d\n",x,y);
+ printf("DrawPlayerField(): x = %d, y = %d\n",jx,jy);
printf("DrawPlayerField(): sx = %d, sy = %d\n",sx,sy);
printf("DrawPlayerField(): This should never happen!\n");
return;
if (element == EL_EXPLODING)
return;
- if (direct_draw_on)
- SetDrawtoField(DRAW_BUFFERED);
-
/* draw things in the field the player is leaving, if needed */
- if (lastJX != JX || lastJY != JY)
+ if (last_jx != jx || last_jy != jy)
{
- if (Store[lastJX][lastJY])
+ if (Store[last_jx][last_jy])
{
- DrawLevelElement(lastJX,lastJY, Store[lastJX][lastJY]);
- DrawLevelElementThruMask(lastJX,lastJY, Feld[lastJX][lastJY]);
+ DrawLevelElement(last_jx,last_jy, Store[last_jx][last_jy]);
+ DrawLevelFieldThruMask(last_jx,last_jy);
}
- else if (Feld[lastJX][lastJY] == EL_DYNAMIT)
- DrawDynamite(lastJX,lastJY);
+ else if (Feld[last_jx][last_jy] == EL_DYNAMIT)
+ DrawDynamite(last_jx,last_jy);
else
- DrawLevelField(lastJX,lastJY);
+ DrawLevelField(last_jx,last_jy);
- if (PlayerPushing)
+ if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx),SCREENY(next_jy)))
{
- int nextJX = JX + (JX - lastJX);
- int nextJY = JY + (JY - lastJY);
-
- if (PlayerGfxPos)
+ if (player->GfxPos)
{
- if (Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
- DrawLevelElement(nextJX,nextJY, EL_SOKOBAN_FELD_LEER);
+ if (Feld[next_jx][next_jy] == EL_SOKOBAN_FELD_VOLL)
+ DrawLevelElement(next_jx,next_jy, EL_SOKOBAN_FELD_LEER);
else
- DrawLevelElement(nextJX,nextJY, EL_LEERRAUM);
+ DrawLevelElement(next_jx,next_jy, EL_LEERRAUM);
}
else
- DrawLevelField(nextJX,nextJY);
+ DrawLevelField(next_jx,next_jy);
}
}
+ if (!IN_SCR_FIELD(sx,sy))
+ return;
+
+ if (setup.direct_draw_on)
+ SetDrawtoField(DRAW_BUFFERED);
+
/* draw things behind the player, if needed */
- if (Store[x][y])
- DrawLevelElement(x,y, Store[x][y]);
+ if (Store[jx][jy])
+ DrawLevelElement(jx,jy, Store[jx][jy]);
else if (element != EL_DYNAMIT && element != EL_DYNABOMB)
- DrawLevelField(x,y);
+ DrawLevelField(jx,jy);
/* draw player himself */
- if (PlayerMovDir==MV_LEFT)
- graphic = (PlayerPushing ? GFX_SPIELER_PUSH_LEFT : GFX_SPIELER_LEFT);
- else if (PlayerMovDir==MV_RIGHT)
- graphic = (PlayerPushing ? GFX_SPIELER_PUSH_RIGHT : GFX_SPIELER_RIGHT);
- else if (PlayerMovDir==MV_UP)
- graphic = GFX_SPIELER_UP;
+ if (player->MovDir==MV_LEFT)
+ graphic = (player->Pushing ? GFX_SPIELER1_PUSH_LEFT : GFX_SPIELER1_LEFT);
+ else if (player->MovDir==MV_RIGHT)
+ graphic = (player->Pushing ? GFX_SPIELER1_PUSH_RIGHT : GFX_SPIELER1_RIGHT);
+ else if (player->MovDir==MV_UP)
+ graphic = GFX_SPIELER1_UP;
else /* MV_DOWN || MV_NO_MOVING */
- graphic = GFX_SPIELER_DOWN;
+ graphic = GFX_SPIELER1_DOWN;
- graphic += PlayerFrame;
+ graphic += player->index_nr * 3*HEROES_PER_LINE;
+ graphic += player->Frame;
- if (PlayerGfxPos)
+ if (player->GfxPos)
{
- if (PlayerMovDir == MV_LEFT || PlayerMovDir == MV_RIGHT)
- sxx = PlayerGfxPos;
+ if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT)
+ sxx = player->GfxPos;
else
- syy = PlayerGfxPos;
+ syy = player->GfxPos;
}
- if (!soft_scrolling_on && ScreenMovPos)
+ if (!setup.soft_scrolling_on && ScreenMovPos)
sxx = syy = 0;
DrawGraphicShiftedThruMask(sx,sy, sxx,syy, graphic, NO_CUTTING);
- if (PlayerPushing && PlayerGfxPos)
+ if (player->Pushing && player->GfxPos)
{
- int nextJX = JX + (JX - lastJX);
- int nextJY = JY + (JY - lastJY);
- int px = SCROLLX(nextJX), py = SCROLLY(nextJY);
+ int px = SCREENX(next_jx), py = SCREENY(next_jy);
- if (Feld[JX][JY] == EL_SOKOBAN_FELD_LEER ||
- Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
+ if (Feld[jx][jy] == EL_SOKOBAN_FELD_LEER ||
+ Feld[next_jx][next_jy] == EL_SOKOBAN_FELD_VOLL)
DrawGraphicShiftedThruMask(px,py,sxx,syy, GFX_SOKOBAN_OBJEKT,NO_CUTTING);
else
{
- int element = Feld[nextJX][nextJY];
+ int element = Feld[next_jx][next_jy];
int graphic = el2gfx(element);
if (element == EL_FELSBROCKEN && sxx)
{
- int phase = (PlayerGfxPos / (TILEX/4));
+ int phase = (player->GfxPos / (TILEX/4));
- if (PlayerMovDir == MV_LEFT)
+ if (player->MovDir == MV_LEFT)
graphic += phase;
else
graphic += (phase+4)%4;
if (element == EL_DYNAMIT)
{
- if ((phase = (96-MovDelay[x][y])/12) > 6)
+ if ((phase = (96-MovDelay[jx][jy])/12) > 6)
phase = 6;
}
else
{
- if ((phase = ((96-MovDelay[x][y])/6) % 8) > 3)
+ if ((phase = ((96-MovDelay[jx][jy])/6) % 8) > 3)
phase = 7-phase;
}
DrawGraphicThruMask(sx,sy, graphic + phase);
}
- if (direct_draw_on)
+ if ((last_jx != jx || last_jy != jy) && Feld[last_jx][last_jy]==EL_EXPLODING)
{
- int dest_x = SX+SCROLLX(x)*TILEX;
- int dest_y = SY+SCROLLY(y)*TILEY;
- int x_size = TILEX;
- int y_size = TILEY;
+ int phase = Frame[last_jx][last_jy];
+ int delay = 2;
- if (!ScreenMovPos)
- {
- dest_x = SX + SCROLLX(MIN(JX,lastJX))*TILEX;
- dest_y = SY + SCROLLY(MIN(JY,lastJY))*TILEY;
- x_size = TILEX * (1 + ABS(JX - lastJX));
- y_size = TILEY * (1 + ABS(JY - lastJY));
- }
+ if (phase > 2)
+ DrawGraphicThruMask(SCREENX(last_jx),SCREENY(last_jy),
+ GFX_EXPLOSION + ((phase-1)/delay-1));
+ }
+
+ if (setup.direct_draw_on)
+ {
+ int dest_x = SX + SCREENX(MIN(jx,last_jx))*TILEX;
+ int dest_y = SY + SCREENY(MIN(jy,last_jy))*TILEY;
+ int x_size = TILEX * (1 + ABS(jx - last_jx));
+ int y_size = TILEY * (1 + ABS(jy - last_jy));
XCopyArea(display,drawto_field,window,gc,
dest_x,dest_y, x_size,y_size, dest_x,dest_y);
{
int phase = getGraphicAnimationPhase(frames, delay, mode);
- if (!(FrameCounter % delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+ if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x),SCREENY(y)))
{
if (mask_mode == USE_MASKING)
- DrawGraphicThruMask(SCROLLX(x),SCROLLY(y), graphic + phase);
+ DrawGraphicThruMask(SCREENX(x),SCREENY(y), graphic + phase);
else
- DrawGraphic(SCROLLX(x),SCROLLY(y), graphic + phase);
+ DrawGraphic(SCREENX(x),SCREENY(y), graphic + phase);
}
}
void DrawGraphic(int x, int y, int graphic)
{
-
#if DEBUG
if (!IN_SCR_FIELD(x,y))
{
void DrawGraphicThruMask(int x, int y, int graphic)
{
- int src_x,src_y, dest_x,dest_y;
- int tile = graphic;
- Pixmap src_pixmap;
- GC drawing_gc;
-
#if DEBUG
if (!IN_SCR_FIELD(x,y))
{
- printf("DrawGraphicThruMask(): x = %d, y = %d\n",x,y);
+ printf("DrawGraphicThruMask(): x = %d,y = %d, graphic = %d\n",x,y,graphic);
printf("DrawGraphicThruMask(): This should never happen!\n");
return;
}
#endif
+ DrawGraphicThruMaskExt(drawto_field, FX+x*TILEX, FY+y*TILEY, graphic);
+ MarkTileDirty(x,y);
+}
+
+void DrawGraphicThruMaskExt(Drawable d, int dest_x, int dest_y, int graphic)
+{
+ int src_x, src_y;
+ int tile = graphic;
+ Pixmap src_pixmap;
+ GC drawing_gc;
+
if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
{
src_pixmap = pix[PIX_BACK];
}
else
{
- DrawGraphic(x,y,graphic);
+ DrawGraphicExt(d, gc, dest_x,dest_y, graphic);
return;
}
- dest_x = FX + x*TILEX;
- dest_y = FY + y*TILEY;
-
if (tile_clipmask[tile] != None)
{
XSetClipMask(display, tile_clip_gc, tile_clipmask[tile]);
XCopyArea(display, src_pixmap, drawto_field, drawing_gc,
src_x,src_y, TILEX,TILEY, dest_x,dest_y);
}
-
- MarkTileDirty(x,y);
}
void DrawMiniGraphic(int x, int y, int graphic)
void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
int cut_mode, int mask_mode)
{
- int ux = UNSCROLLX(x), uy = UNSCROLLY(y);
+ int ux = LEVELX(x), uy = LEVELY(y);
int graphic = el2gfx(element);
int phase4 = ABS(MovPos[ux][uy])/(TILEX/4);
int phase = phase4 / 2;
}
else if (element==EL_MAUER_LEBT)
{
- BOOL links_massiv = FALSE, rechts_massiv = FALSE;
+ boolean links_massiv = FALSE, rechts_massiv = FALSE;
if (!IN_LEV_FIELD(ux-1,uy) || IS_MAUER(Feld[ux-1][uy]))
links_massiv = TRUE;
void DrawLevelElementExt(int x, int y, int dx, int dy, int element,
int cut_mode, int mask_mode)
{
- if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
- DrawScreenElementExt(SCROLLX(x),SCROLLY(y), dx,dy, element,
+ if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCREENX(x),SCREENY(y)))
+ DrawScreenElementExt(SCREENX(x),SCREENY(y), dx,dy, element,
cut_mode, mask_mode);
}
DrawLevelElementExt(x,y, 0,0, element, NO_CUTTING, USE_MASKING);
}
+void DrawLevelFieldThruMask(int x, int y)
+{
+ DrawLevelElementExt(x,y, 0,0, Feld[x][y], NO_CUTTING, USE_MASKING);
+}
+
void ErdreichAnbroeckeln(int x, int y)
{
int i, width, height, cx,cy;
- int ux = UNSCROLLX(x), uy = UNSCROLLY(y);
+ int ux = LEVELX(x), uy = LEVELY(y);
int element, graphic;
int snip = 4;
static int xy[4][2] =
void DrawLevelElement(int x, int y, int element)
{
- if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
- DrawScreenElement(SCROLLX(x),SCROLLY(y),element);
+ if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCREENX(x),SCREENY(y)))
+ DrawScreenElement(SCREENX(x),SCREENY(y),element);
}
void DrawScreenField(int x, int y)
{
- int ux = UNSCROLLX(x), uy = UNSCROLLY(y);
+ int ux = LEVELX(x), uy = LEVELY(y);
int element;
if (!IN_LEV_FIELD(ux,uy))
if (IS_MOVING(ux,uy))
{
int horiz_move = (MovDir[ux][uy]==MV_LEFT || MovDir[ux][uy]==MV_RIGHT);
- BOOL cut_mode = NO_CUTTING;
+ boolean cut_mode = NO_CUTTING;
if (Store[ux][uy]==EL_MORAST_LEER ||
Store[ux][uy]==EL_SIEB_LEER ||
Store[ux][uy]==EL_AMOEBE_NASS)
cut_mode = CUT_ABOVE;
else if (Store[ux][uy]==EL_MORAST_VOLL ||
-
-#if 0
- Store[ux][uy]==EL_SALZSAEURE ||
-#endif
-
- Store[ux][uy]==EL_SIEB_VOLL ||
- Store[ux][uy]==EL_SIEB2_VOLL)
+ Store[ux][uy]==EL_SIEB_VOLL ||
+ Store[ux][uy]==EL_SIEB2_VOLL)
cut_mode = CUT_BELOW;
if (cut_mode==CUT_ABOVE)
else
DrawScreenElementShifted(x,y, 0,MovPos[ux][uy], element, cut_mode);
-#if 1
if (Store[ux][uy] == EL_SALZSAEURE)
DrawLevelElementThruMask(ux,uy+1, EL_SALZSAEURE);
-#endif
-
}
else if (IS_BLOCKED(ux,uy))
{
int oldx,oldy;
int sx, sy;
int horiz_move;
- BOOL cut_mode = NO_CUTTING;
+ boolean cut_mode = NO_CUTTING;
Blocked2Moving(ux,uy,&oldx,&oldy);
- sx = SCROLLX(oldx);
- sy = SCROLLY(oldy);
+ sx = SCREENX(oldx);
+ sy = SCREENY(oldy);
horiz_move = (MovDir[oldx][oldy]==MV_LEFT || MovDir[oldx][oldy]==MV_RIGHT);
if (Store[oldx][oldy]==EL_MORAST_LEER ||
void DrawLevelField(int x, int y)
{
- if (IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
- DrawScreenField(SCROLLX(x),SCROLLY(y));
+ if (IN_SCR_FIELD(SCREENX(x),SCREENY(y)))
+ DrawScreenField(SCREENX(x),SCREENY(y));
else if (IS_MOVING(x,y))
{
int newx,newy;
Moving2Blocked(x,y,&newx,&newy);
- if (IN_SCR_FIELD(SCROLLX(newx),SCROLLY(newy)))
- DrawScreenField(SCROLLX(newx),SCROLLY(newy));
+ if (IN_SCR_FIELD(SCREENX(newx),SCREENY(newy)))
+ DrawScreenField(SCREENX(newx),SCREENY(newy));
}
else if (IS_BLOCKED(x,y))
{
int oldx,oldy;
Blocked2Moving(x,y,&oldx,&oldy);
- if (IN_SCR_FIELD(SCROLLX(oldx),SCROLLY(oldy)))
- DrawScreenField(SCROLLX(oldx),SCROLLY(oldy));
+ if (IN_SCR_FIELD(SCREENX(oldx),SCREENY(oldy)))
+ DrawScreenField(SCREENX(oldx),SCREENY(oldy));
}
}
DrawMiniGraphic(x,y,graphic);
}
-void DrawMiniElementOrWall(int x, int y, int scroll_x, int scroll_y)
+void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
{
- if (x+scroll_x<-1 || x+scroll_x>lev_fieldx ||
- y+scroll_y<-1 || y+scroll_y>lev_fieldy)
- DrawMiniElement(x,y,EL_LEERRAUM);
- else if (x+scroll_x==-1 || x+scroll_x==lev_fieldx ||
- y+scroll_y==-1 || y+scroll_y==lev_fieldy)
- DrawMiniElement(x,y,EL_BETON);
+ int x = sx + scroll_x, y = sy + scroll_y;
+
+ if (x<-1 || x>lev_fieldx || y<-1 || y>lev_fieldy)
+ DrawMiniElement(sx,sy,EL_LEERRAUM);
+ else if (x==-1 || x==lev_fieldx || y==-1 || y==lev_fieldy)
+ DrawMiniElement(sx,sy,EL_BETON);
else
- DrawMiniElement(x,y,Feld[x+scroll_x][y+scroll_y]);
+ DrawMiniElement(sx,sy,Feld[x][y]);
}
void DrawMicroElement(int xpos, int ypos, int element)
for(y=BY1; y<=BY2; y++)
DrawScreenField(x,y);
- if (soft_scrolling_on)
+ if (setup.soft_scrolling_on)
XCopyArea(display,fieldbuffer,backbuffer,gc,
FX,FY, SXSIZE,SYSIZE,
SX,SY);
redraw_mask |= REDRAW_MICROLEV;
}
-int AYS_in_range(int x, int y)
+int REQ_in_range(int x, int y)
{
if (y>DY+249 && y<DY+278)
{
return(0);
}
-BOOL AreYouSure(char *text, unsigned int ays_state)
+boolean Request(char *text, unsigned int req_state)
{
int mx,my, ty, result = -1;
unsigned int old_door_state;
+ /* pause network game while waiting for request to answer */
+ if (options.network &&
+ game_status == PLAYING &&
+ req_state & REQUEST_WAIT_FOR)
+ SendToServer_PausePlaying();
+
old_door_state = GetDoorState();
CloseDoor(DOOR_CLOSE_1);
text+=(tl+(tc==32));
}
- if (ays_state & AYS_ASK)
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX4,OK_BUTTON_GFX_YPOS,
- DXSIZE,OK_BUTTON_YSIZE,
- DOOR_GFX_PAGEX1,OK_BUTTON_YPOS);
- else if (ays_state & AYS_CONFIRM)
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX4,CONFIRM_BUTTON_GFX_YPOS,
- DXSIZE,CONFIRM_BUTTON_YSIZE,
- DOOR_GFX_PAGEX1,CONFIRM_BUTTON_YPOS);
+ if (req_state & REQ_ASK)
+ {
+ DrawYesNoButton(BUTTON_OK, DB_INIT);
+ DrawYesNoButton(BUTTON_NO, DB_INIT);
+ }
+ else if (req_state & REQ_CONFIRM)
+ {
+ DrawConfirmButton(BUTTON_CONFIRM, DB_INIT);
+ }
+ else if (req_state & REQ_PLAYER)
+ {
+ DrawPlayerButton(BUTTON_PLAYER_1, DB_INIT);
+ DrawPlayerButton(BUTTON_PLAYER_2, DB_INIT);
+ DrawPlayerButton(BUTTON_PLAYER_3, DB_INIT);
+ DrawPlayerButton(BUTTON_PLAYER_4, DB_INIT);
+ }
OpenDoor(DOOR_OPEN_1);
ClearEventQueue();
- if (!(ays_state & AYS_ASK) && !(ays_state & AYS_CONFIRM))
+ if (!(req_state & REQUEST_WAIT_FOR))
return(FALSE);
if (game_status != MAINMENU)
button_status = MB_RELEASED;
}
- if (ays_state & AYS_ASK)
- choice = CheckChooseButtons(mx,my,button_status);
- else
+ if (req_state & REQ_ASK)
+ choice = CheckYesNoButtons(mx,my,button_status);
+ else if (req_state & REQ_CONFIRM)
choice = CheckConfirmButton(mx,my,button_status);
+ else
+ choice = CheckPlayerButtons(mx,my,button_status);
switch(choice)
{
result = FALSE;
break;
case BUTTON_CONFIRM:
- result = TRUE|FALSE;
+ result = TRUE | FALSE;
+ break;
+ case BUTTON_PLAYER_1:
+ result = 1;
+ break;
+ case BUTTON_PLAYER_2:
+ result = 2;
+ break;
+ case BUTTON_PLAYER_3:
+ result = 3;
+ break;
+ case BUTTON_PLAYER_4:
+ result = 4;
break;
default:
break;
result = 0;
break;
}
+ if (req_state & REQ_PLAYER)
+ result = 0;
break;
case KeyRelease:
key_joystick_mapping = 0;
if (game_status != MAINMENU)
StopAnimation();
- if (!(ays_state & AYS_STAY_OPEN))
+ if (!(req_state & REQ_STAY_OPEN))
{
CloseDoor(DOOR_CLOSE_1);
- if (!(ays_state & AYS_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
+ if (!(req_state & REQ_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
{
XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
}
}
+ /* continue network game after request */
+ if (options.network &&
+ game_status == PLAYING &&
+ req_state & REQUEST_WAIT_FOR)
+ SendToServer_ContinuePlaying();
+
return(result);
}
else if (door2==DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2)
door_state &= ~DOOR_CLOSE_2;
- if (quick_doors)
+ if (setup.quick_doors)
{
stepsize = 20;
door_delay_value = 0;
for(x=start; x<=DXSIZE; x+=stepsize)
{
- while(!DelayReached(&door_delay, door_delay_value/10))
- Delay(1);
+ WaitUntilDelayReached(&door_delay, door_delay_value);
if (door_state & DOOR_ACTION_1)
{
case EL_ZEIT_VOLL: return(GFX_ZEIT_VOLL);
case EL_ZEIT_LEER: return(GFX_ZEIT_LEER);
case EL_MAUER_LEBT: return(GFX_MAUER_LEBT);
+ case EL_MAUER_X: return(GFX_MAUER_X);
+ case EL_MAUER_Y: return(GFX_MAUER_Y);
+ case EL_MAUER_XY: return(GFX_MAUER_XY);
case EL_EDELSTEIN_BD: return(GFX_EDELSTEIN_BD);
case EL_EDELSTEIN_GELB: return(GFX_EDELSTEIN_GELB);
case EL_EDELSTEIN_ROT: return(GFX_EDELSTEIN_ROT);
projects / rocksndiamonds.git / blobdiff