projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060829-1-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 9dff9b9e5be507853d074183a73861020e634c71..7a2fd3e29793c249ffe6c43a5c4fc5dd527edb38 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-1,7
+1,7
@@
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-200
2
Artsoft Entertainment *
+* (c) 1995-200
6
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-138,7
+138,6
@@
void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height)
level.game_engine_type == GAME_ENGINE_TYPE_EM)
{
/* currently there is no partial redraw -- always redraw whole playfield */
level.game_engine_type == GAME_ENGINE_TYPE_EM)
{
/* currently there is no partial redraw -- always redraw whole playfield */
-
RedrawPlayfield_EM(TRUE);
/* blit playfield from scroll buffer to normal back buffer for fading in */
RedrawPlayfield_EM(TRUE);
/* blit playfield from scroll buffer to normal back buffer for fading in */
@@
-184,6
+183,14
@@
void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height)
}
}
}
}
+ if (force_redraw)
+ {
+ x = gfx.sx;
+ y = gfx.sy;
+ width = gfx.sxsize;
+ height = gfx.sysize;
+ }
+
BlitBitmap(drawto, window, x, y, width, height, x, y);
}
BlitBitmap(drawto, window, x, y, width, height, x, y);
}
@@
-424,24
+431,24
@@
void FadeExt(int fade_mask, int fade_mode)
int post_delay = (fade_mode == FADE_MODE_FADE_OUT ? menu.post_delay : 0);
int x, y, width, height;
int post_delay = (fade_mode == FADE_MODE_FADE_OUT ? menu.post_delay : 0);
int x, y, width, height;
- if (fade_mask & REDRAW_ALL)
- {
- x = 0;
- y = 0;
- width = WIN_XSIZE;
- height = WIN_YSIZE;
- }
- else if (fade_mask & REDRAW_FIELD)
+ if (fade_mask & REDRAW_FIELD)
{
x = REAL_SX;
y = REAL_SY;
width = FULL_SXSIZE;
height = FULL_SYSIZE;
}
{
x = REAL_SX;
y = REAL_SY;
width = FULL_SXSIZE;
height = FULL_SYSIZE;
}
+ else /* REDRAW_ALL */
+ {
+ x = 0;
+ y = 0;
+ width = WIN_XSIZE;
+ height = WIN_YSIZE;
+ }
redraw_mask |= fade_mask;
redraw_mask |= fade_mask;
- if (!setup.fad
ing
|| fade_delay == 0)
+ if (!setup.fad
e_screens
|| fade_delay == 0)
{
if (fade_mode == FADE_MODE_FADE_OUT)
ClearRectangle(backbuffer, x, y, width, height);
{
if (fade_mode == FADE_MODE_FADE_OUT)
ClearRectangle(backbuffer, x, y, width, height);
@@
-2226,6
+2233,10
@@
void WaitForEventToContinue()
button_status = MB_RELEASED;
button_status = MB_RELEASED;
+#if 1
+ ClearEventQueue();
+#endif
+
while (still_wait)
{
if (PendingEvent())
while (still_wait)
{
if (PendingEvent())
@@
-5306,9
+5317,9
@@
int getGameFrameDelay_EM(int native_em_game_frame_delay)
unsigned int InitRND(long seed)
{
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
unsigned int InitRND(long seed)
{
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
- return InitEngineR
ND
_EM(seed);
+ return InitEngineR
andom
_EM(seed);
else
else
- return InitEngineRND(seed);
+ return InitEngineR
andom_R
ND(seed);
}
void InitGraphicInfo_EM(void)
}
void InitGraphicInfo_EM(void)