projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20041124-1-src
[rocksndiamonds.git]
/
src
/
cartoons.c
diff --git
a/src/cartoons.c
b/src/cartoons.c
index b95525049e6cf613d8ea1b2a2a36f1ee16f30b14..55c36b5b56f0f08b493d3243786cbcadb657fe80 100644
(file)
--- a/
src/cartoons.c
+++ b/
src/cartoons.c
@@
-24,37
+24,43
@@
static struct ToonInfo toons[MAX_NUM_TOONS];
static void PrepareBackbuffer()
{
/* Fill empty backbuffer for animation functions */
static void PrepareBackbuffer()
{
/* Fill empty backbuffer for animation functions */
- if (setup.direct_draw && game_status == PLAYING)
+ if (setup.direct_draw && game_status ==
GAME_MODE_
PLAYING)
{
{
- int xx,yy;
+ int xx,
yy;
SetDrawtoField(DRAW_BACKBUFFER);
SetDrawtoField(DRAW_BACKBUFFER);
- for
(xx=0; xx<
SCR_FIELDX; xx++)
- for
(yy=0; yy<
SCR_FIELDY; yy++)
- DrawScreenField(xx,yy);
+ for
(xx = 0; xx <
SCR_FIELDX; xx++)
+ for
(yy = 0; yy <
SCR_FIELDY; yy++)
+ DrawScreenField(xx,
yy);
DrawAllPlayers();
SetDrawtoField(DRAW_DIRECT);
}
DrawAllPlayers();
SetDrawtoField(DRAW_DIRECT);
}
- if (setup.soft_scrolling && game_status == PLAYING)
+ if (setup.soft_scrolling && game_status ==
GAME_MODE_
PLAYING)
{
int fx = FX, fy = FY;
fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
fy += (ScreenMovDir & (MV_UP|MV_DOWN) ? ScreenGfxPos : 0);
{
int fx = FX, fy = FY;
fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
fy += (ScreenMovDir & (MV_UP|MV_DOWN) ? ScreenGfxPos : 0);
- BlitBitmap(fieldbuffer, backbuffer, fx,
fy, SXSIZE,SYSIZE, SX,
SY);
+ BlitBitmap(fieldbuffer, backbuffer, fx,
fy, SXSIZE, SYSIZE, SX,
SY);
}
}
boolean ToonNeedsRedraw()
{
}
}
boolean ToonNeedsRedraw()
{
- return (game_status == HELPSCREEN ||
- (game_status == MAINMENU &&
+#if 1
+ return TRUE;
+#else
+ return (game_status == GAME_MODE_INFO ||
+ game_status == GAME_MODE_LEVELS ||
+ game_status == GAME_MODE_SETUP ||
+ (game_status == GAME_MODE_MAIN &&
((redraw_mask & REDRAW_MICROLEVEL) ||
(redraw_mask & REDRAW_MICROLABEL))));
((redraw_mask & REDRAW_MICROLEVEL) ||
(redraw_mask & REDRAW_MICROLABEL))));
+#endif
}
void InitToons()
}
void InitToons()
@@
-68,7
+74,7
@@
void InitToons()
for (i=0; i < num_toons; i++)
{
int graphic = IMG_TOON_1 + i;
for (i=0; i < num_toons; i++)
{
int graphic = IMG_TOON_1 + i;
- struct FileInfo *image = getImageListEntry(graphic);
+ struct FileInfo *image = getImageListEntry
FromImageID
(graphic);
toons[i].bitmap = graphic_info[graphic].bitmap;
toons[i].bitmap = graphic_info[graphic].bitmap;