projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981029-1
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 303dc46981781b72e2b3a3cf161aaec4ae471b24..6fe5759583961db3c98a09b95fc92f5754130474 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-28,12
+28,12
@@
#include <math.h>
#ifdef MSDOS
#include <math.h>
#ifdef MSDOS
-extern
BOOL
wait_for_vsync;
+extern
boolean
wait_for_vsync;
#endif
void SetDrawtoField(int mode)
{
#endif
void SetDrawtoField(int mode)
{
- if (mode == DRAW_BUFFERED && s
oft_scrolling_on
)
+ if (mode == DRAW_BUFFERED && s
etup.soft_scrolling
)
{
FX = TILEX;
FY = TILEY;
{
FX = TILEX;
FY = TILEY;
@@
-66,7
+66,7
@@
void BackToFront()
int x,y;
Drawable buffer = (drawto_field != window ? drawto_field : backbuffer);
int x,y;
Drawable buffer = (drawto_field != window ? drawto_field : backbuffer);
- 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_MAIN;
if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
@@
-107,7
+107,7
@@
void BackToFront()
{
int fx = FX, fy = FY;
{
int fx = FX, fy = FY;
- if (s
oft_scrolling_on
)
+ if (s
etup.soft_scrolling
)
{
fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
fy += (ScreenMovDir & (MV_UP|MV_DOWN) ? ScreenGfxPos : 0);
{
fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
fy += (ScreenMovDir & (MV_UP|MV_DOWN) ? ScreenGfxPos : 0);
@@
-189,7
+189,7
@@
void FadeToFront()
/*
long fading_delay = 300;
/*
long fading_delay = 300;
- if (
fading_on
&& (redraw_mask & REDRAW_FIELD))
+ if (
setup.fading
&& (redraw_mask & REDRAW_FIELD))
{
*/
{
*/
@@
-257,7
+257,7
@@
void ClearWindow()
XFillRectangle(display,backbuffer,gc,
REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
XFillRectangle(display,backbuffer,gc,
REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
- if (s
oft_scrolling_on
&& game_status==PLAYING)
+ if (s
etup.soft_scrolling
&& game_status==PLAYING)
{
XFillRectangle(display,fieldbuffer,gc,
0,0, FXSIZE,FYSIZE);
{
XFillRectangle(display,fieldbuffer,gc,
0,0, FXSIZE,FYSIZE);
@@
-266,7
+266,7
@@
void ClearWindow()
else
SetDrawtoField(DRAW_BACKBUFFER);
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);
{
XFillRectangle(display,window,gc,
REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
@@
-357,11
+357,6
@@
void DrawPlayer(struct PlayerInfo *player)
int element = Feld[jx][jy];
int graphic, phase;
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 (!player->active || player->gone ||
!IN_SCR_FIELD(SCREENX(last_jx),SCREENY(last_jy)))
return;
@@
-410,7
+405,7
@@
void DrawPlayer(struct PlayerInfo *player)
if (!IN_SCR_FIELD(sx,sy))
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 */
SetDrawtoField(DRAW_BUFFERED);
/* draw things behind the player, if needed */
@@
-442,7
+437,7
@@
void DrawPlayer(struct PlayerInfo *player)
syy = player->GfxPos;
}
syy = player->GfxPos;
}
- if (!s
oft_scrolling_on
&& ScreenMovPos)
+ if (!s
etup.soft_scrolling
&& ScreenMovPos)
sxx = syy = 0;
DrawGraphicShiftedThruMask(sx,sy, sxx,syy, graphic, NO_CUTTING);
sxx = syy = 0;
DrawGraphicShiftedThruMask(sx,sy, sxx,syy, graphic, NO_CUTTING);
@@
-503,7
+498,7
@@
void DrawPlayer(struct PlayerInfo *player)
GFX_EXPLOSION + ((phase-1)/delay-1));
}
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;
{
int dest_x = SX + SCREENX(MIN(jx,last_jx))*TILEX;
int dest_y = SY + SCREENY(MIN(jy,last_jy))*TILEY;
@@
-913,7
+908,7
@@
void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
}
else if (element==EL_MAUER_LEBT)
{
}
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 (!IN_LEV_FIELD(ux-1,uy) || IS_MAUER(Feld[ux-1][uy]))
links_massiv = TRUE;
@@
-1104,7
+1099,7
@@
void DrawScreenField(int x, int y)
if (IS_MOVING(ux,uy))
{
int horiz_move = (MovDir[ux][uy]==MV_LEFT || MovDir[ux][uy]==MV_RIGHT);
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 ||
if (Store[ux][uy]==EL_MORAST_LEER ||
Store[ux][uy]==EL_SIEB_LEER ||
@@
-1134,7
+1129,7
@@
void DrawScreenField(int x, int y)
int oldx,oldy;
int sx, sy;
int horiz_move;
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);
Blocked2Moving(ux,uy,&oldx,&oldy);
sx = SCREENX(oldx);
@@
-1234,7
+1229,7
@@
void DrawLevel()
for(y=BY1; y<=BY2; y++)
DrawScreenField(x,y);
for(y=BY1; y<=BY2; y++)
DrawScreenField(x,y);
- if (s
oft_scrolling_on
)
+ if (s
etup.soft_scrolling
)
XCopyArea(display,fieldbuffer,backbuffer,gc,
FX,FY, SXSIZE,SYSIZE,
SX,SY);
XCopyArea(display,fieldbuffer,backbuffer,gc,
FX,FY, SXSIZE,SYSIZE,
SX,SY);
@@
-1303,13
+1298,15
@@
int REQ_in_range(int x, int y)
return(0);
}
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 */
{
int mx,my, ty, result = -1;
unsigned int old_door_state;
/* pause network game while waiting for request to answer */
- if (network && game_status == PLAYING && req_state & REQUEST_WAIT_FOR)
+ if (options.network &&
+ game_status == PLAYING &&
+ req_state & REQUEST_WAIT_FOR)
SendToServer_PausePlaying();
old_door_state = GetDoorState();
SendToServer_PausePlaying();
old_door_state = GetDoorState();
@@
-1379,24
+1376,16
@@
BOOL Request(char *text, unsigned int req_state)
button_status = MB_RELEASED;
button_status = MB_RELEASED;
- while(result
<
0)
+ while(result
<
0)
{
{
- DoAnimation();
- Delay(10);
-
if (XPending(display))
{
XEvent event;
XNextEvent(display, &event);
if (XPending(display))
{
XEvent event;
XNextEvent(display, &event);
+
switch(event.type)
{
switch(event.type)
{
- case Expose:
- HandleExposeEvent((XExposeEvent *) &event);
- break;
- case UnmapNotify:
- SleepWhileUnmapped();
- break;
case ButtonPress:
case ButtonRelease:
case MotionNotify:
case ButtonPress:
case ButtonRelease:
case MotionNotify:
@@
-1438,6
+1427,7
@@
BOOL Request(char *text, unsigned int req_state)
case BUTTON_CONFIRM:
result = TRUE | FALSE;
break;
case BUTTON_CONFIRM:
result = TRUE | FALSE;
break;
+
case BUTTON_PLAYER_1:
result = 1;
break;
case BUTTON_PLAYER_1:
result = 1;
break;
@@
-1450,11
+1440,13
@@
BOOL Request(char *text, unsigned int req_state)
case BUTTON_PLAYER_4:
result = 4;
break;
case BUTTON_PLAYER_4:
result = 4;
break;
+
default:
break;
}
break;
}
default:
break;
}
break;
}
+
case KeyPress:
switch(XLookupKeysym((XKeyEvent *)&event,
((XKeyEvent *)&event)->state))
case KeyPress:
switch(XLookupKeysym((XKeyEvent *)&event,
((XKeyEvent *)&event)->state))
@@
-1462,36
+1454,41
@@
BOOL Request(char *text, unsigned int req_state)
case XK_Return:
result = 1;
break;
case XK_Return:
result = 1;
break;
+
case XK_Escape:
result = 0;
break;
case XK_Escape:
result = 0;
break;
+
+ default:
+ break;
}
if (req_state & REQ_PLAYER)
result = 0;
break;
}
if (req_state & REQ_PLAYER)
result = 0;
break;
+
case KeyRelease:
key_joystick_mapping = 0;
break;
case KeyRelease:
key_joystick_mapping = 0;
break;
- case FocusIn:
- case FocusOut:
- HandleFocusEvent((XFocusChangeEvent *) &event);
- break;
- case ClientMessage:
- HandleClientMessageEvent((XClientMessageEvent *) &event);
- break;
+
default:
default:
+ HandleOtherEvents(&event);
break;
}
}
break;
}
}
- else if (JoystickButton() == JOY_BUTTON_NEW_PRESSED)
+ else if (
Any
JoystickButton() == JOY_BUTTON_NEW_PRESSED)
{
{
- int joy
=
Joystick();
+ int joy
= Any
Joystick();
if (joy & JOY_BUTTON_1)
result = 1;
else if (joy & JOY_BUTTON_2)
result = 0;
}
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)
}
if (game_status != MAINMENU)
@@
-1511,7
+1508,9
@@
BOOL Request(char *text, unsigned int req_state)
}
/* continue network game after request */
}
/* continue network game after request */
- if (network && game_status == PLAYING && req_state & REQUEST_WAIT_FOR)
+ if (options.network &&
+ game_status == PLAYING &&
+ req_state & REQUEST_WAIT_FOR)
SendToServer_ContinuePlaying();
return(result);
SendToServer_ContinuePlaying();
return(result);
@@
-1573,7
+1572,7
@@
unsigned int MoveDoor(unsigned int door_state)
else if (door2==DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2)
door_state &= ~DOOR_CLOSE_2;
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;
{
stepsize = 20;
door_delay_value = 0;
@@
-1672,6
+1671,9
@@
unsigned int MoveDoor(unsigned int door_state)
}
}
}
}
+ 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)
if (door_state & DOOR_ACTION_1)
door1 = door_state & DOOR_ACTION_1;
if (door_state & DOOR_ACTION_2)