#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)
{
FX = TILEX;
FY = TILEY;
void BackToFront()
{
int x,y;
- Drawable buffer = (drawto_field != window ? drawto_field : backbuffer);
+ Drawable buffer = (drawto_field == window ? backbuffer : drawto_field);
- if (direct_draw_on && game_status == PLAYING)
+ if (setup.direct_draw && 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 || ScreenGfxPos)
+ if (redraw_mask & REDRAW_FIELD)
redraw_mask &= ~REDRAW_TILES;
+ /*
+ if (redraw_mask & REDRAW_FIELD ||
+ (ScreenGfxPos && setup.soft_scrolling && game_status == PLAYING))
+ redraw_mask &= ~REDRAW_TILES;
+ */
+
if (!redraw_mask)
return;
{
int fx = FX, fy = FY;
- if (soft_scrolling_on)
+ if (setup.soft_scrolling)
{
fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
fy += (ScreenMovDir & (MV_UP|MV_DOWN) ? ScreenGfxPos : 0);
/*
long fading_delay = 300;
- if (fading_on && (redraw_mask & REDRAW_FIELD))
+ if (setup.fading && (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 && 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 && game_status==PLAYING)
{
XFillRectangle(display,window,gc,
REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
int element = Feld[jx][jy];
int graphic, phase;
- /*
- 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 (!IN_SCR_FIELD(sx,sy))
return;
- if (direct_draw_on)
+ if (setup.direct_draw)
SetDrawtoField(DRAW_BUFFERED);
/* draw things behind the player, if needed */
syy = player->GfxPos;
}
- if (!soft_scrolling_on && ScreenMovPos)
+ if (!setup.soft_scrolling && ScreenMovPos)
sxx = syy = 0;
DrawGraphicShiftedThruMask(sx,sy, sxx,syy, graphic, NO_CUTTING);
GFX_EXPLOSION + ((phase-1)/delay-1));
}
- if (direct_draw_on)
+ if (setup.direct_draw)
{
int dest_x = SX + SCREENX(MIN(jx,last_jx))*TILEX;
int dest_y = SY + SCREENY(MIN(jy,last_jy))*TILEY;
}
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;
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 ||
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 = SCREENX(oldx);
for(y=BY1; y<=BY2; y++)
DrawScreenField(x,y);
- if (soft_scrolling_on)
+ if (setup.soft_scrolling)
XCopyArea(display,fieldbuffer,backbuffer,gc,
FX,FY, SXSIZE,SYSIZE,
SX,SY);
return(0);
}
-BOOL Request(char *text, unsigned int req_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);
}
if (req_state & REQ_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);
+ {
+ DrawYesNoButton(BUTTON_OK, DB_INIT);
+ DrawYesNoButton(BUTTON_NO, DB_INIT);
+ }
else if (req_state & REQ_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);
+ {
+ 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);
-
- /*
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
- PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
- DOOR_GFX_PAGEX1 + PLAYER_BUTTON_1_XPOS, PLAYER_BUTTON_1_YPOS);
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
- PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
- DOOR_GFX_PAGEX1 + PLAYER_BUTTON_1_XPOS, PLAYER_BUTTON_1_YPOS);
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
- PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
- DOOR_GFX_PAGEX1 + PLAYER_BUTTON_2_XPOS, PLAYER_BUTTON_2_YPOS);
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
- PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
- DOOR_GFX_PAGEX1 + PLAYER_BUTTON_3_XPOS, PLAYER_BUTTON_3_YPOS);
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX4 + PLAYER_BUTTON_GFX_XPOS, PLAYER_BUTTON_GFX_YPOS,
- PLAYER_BUTTON_XSIZE,PLAYER_BUTTON_YSIZE,
- DOOR_GFX_PAGEX1 + PLAYER_BUTTON_4_XPOS, PLAYER_BUTTON_4_YPOS);
- */
}
OpenDoor(DOOR_OPEN_1);
ClearEventQueue();
- if (!(req_state & REQ_ASK) &&
- !(req_state & REQ_CONFIRM) &&
- !(req_state & REQ_PLAYER))
+ if (!(req_state & REQUEST_WAIT_FOR))
return(FALSE);
if (game_status != MAINMENU)
button_status = MB_RELEASED;
- while(result<0)
+ while(result < 0)
{
- DoAnimation();
- Delay(10);
-
if (XPending(display))
{
XEvent event;
XNextEvent(display, &event);
+
switch(event.type)
{
- case Expose:
- HandleExposeEvent((XExposeEvent *) &event);
- break;
- case UnmapNotify:
- SleepWhileUnmapped();
- break;
case ButtonPress:
case ButtonRelease:
case MotionNotify:
case BUTTON_CONFIRM:
result = TRUE | FALSE;
break;
+
case BUTTON_PLAYER_1:
result = 1;
break;
case BUTTON_PLAYER_4:
result = 4;
break;
+
default:
break;
}
break;
}
+
case KeyPress:
switch(XLookupKeysym((XKeyEvent *)&event,
((XKeyEvent *)&event)->state))
case XK_Return:
result = 1;
break;
+
case XK_Escape:
result = 0;
break;
+
+ default:
+ break;
}
if (req_state & REQ_PLAYER)
result = 0;
break;
+
case KeyRelease:
key_joystick_mapping = 0;
break;
- case FocusIn:
- case FocusOut:
- HandleFocusEvent((XFocusChangeEvent *) &event);
- break;
- case ClientMessage:
- HandleClientMessageEvent((XClientMessageEvent *) &event);
- break;
+
default:
+ HandleOtherEvents(&event);
break;
}
}
- else if (JoystickButton() == JOY_BUTTON_NEW_PRESSED)
+ else if (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED)
{
- int joy=Joystick();
+ int joy = AnyJoystick();
if (joy & JOY_BUTTON_1)
result = 1;
else if (joy & JOY_BUTTON_2)
result = 0;
}
+
+ DoAnimation();
+
+ /* don't eat all CPU time */
+ Delay(10);
}
if (game_status != MAINMENU)
}
}
+ /* 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;
}
}
+ if (setup.quick_doors)
+ StopSound(SND_OEFFNEN);
+
if (door_state & DOOR_ACTION_1)
door1 = door_state & DOOR_ACTION_1;
if (door_state & DOOR_ACTION_2)
projects / rocksndiamonds.git / blobdiff