projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rocksndiamonds-3.2.6.0
[rocksndiamonds.git]
/
src
/
cartoons.c
diff --git
a/src/cartoons.c
b/src/cartoons.c
index fd53e502a2e955124eaf9c656cb0b721cf83a11a..70d6d3d54ac6a8731eff3a45fd86483fa438b517 100644
(file)
--- a/
src/cartoons.c
+++ b/
src/cartoons.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 *
@@
-23,19
+23,12
@@
static struct ToonInfo toons[MAX_NUM_TOONS];
static void PrepareBackbuffer()
{
static void PrepareBackbuffer()
{
- /* Fill empty backbuffer for animation functions */
-
if (setup.direct_draw && game_status == GAME_MODE_PLAYING
)
+ if (game_status == GAME_MODE_PLAYING &&
+
level.game_engine_type == GAME_ENGINE_TYPE_EM
)
{
{
-
int xx, yy
;
+
BlitScreenToBitmap_EM(backbuffer)
;
- SetDrawtoField(DRAW_BACKBUFFER);
-
- for (xx = 0; xx < SCR_FIELDX; xx++)
- for (yy = 0; yy < SCR_FIELDY; yy++)
- DrawScreenField(xx, yy);
- DrawAllPlayers();
-
- SetDrawtoField(DRAW_DIRECT);
+ return;
}
if (setup.soft_scrolling && game_status == GAME_MODE_PLAYING)
}
if (setup.soft_scrolling && game_status == GAME_MODE_PLAYING)
@@
-51,16
+44,7
@@
static void PrepareBackbuffer()
boolean ToonNeedsRedraw()
{
boolean ToonNeedsRedraw()
{
-#if 1
return TRUE;
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))));
-#endif
}
void InitToons()
}
void InitToons()
@@
-68,13
+52,13
@@
void InitToons()
int num_toons = MAX_NUM_TOONS;
int i;
int num_toons = MAX_NUM_TOONS;
int i;
- if (global.num_toons > 0 && global.num_toons < MAX_NUM_TOONS)
+ if (global.num_toons >
=
0 && global.num_toons < MAX_NUM_TOONS)
num_toons = global.num_toons;
num_toons = global.num_toons;
- for (i
=
0; i < num_toons; i++)
+ for (i
=
0; i < num_toons; i++)
{
int graphic = IMG_TOON_1 + 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;
@@
-96,7
+80,11
@@
void InitToons()
toons[i].position = image->parameter[GFX_ARG_POSITION];
}
toons[i].position = image->parameter[GFX_ARG_POSITION];
}
+#if 1
+ InitToonScreen(bitmap_db_toons,
+#else
InitToonScreen(bitmap_db_door,
InitToonScreen(bitmap_db_door,
+#endif
BackToFront, PrepareBackbuffer, ToonNeedsRedraw,
toons, num_toons,
REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
BackToFront, PrepareBackbuffer, ToonNeedsRedraw,
toons, num_toons,
REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,