projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20051126-1-src
[rocksndiamonds.git]
/
src
/
cartoons.c
diff --git
a/src/cartoons.c
b/src/cartoons.c
index fd53e502a2e955124eaf9c656cb0b721cf83a11a..aa9667c27fceee45e287694e5dd82ea5a38d60bf 100644
(file)
--- a/
src/cartoons.c
+++ b/
src/cartoons.c
@@
-23,7
+23,15
@@
static struct ToonInfo toons[MAX_NUM_TOONS];
static void PrepareBackbuffer()
{
static void PrepareBackbuffer()
{
- /* Fill empty backbuffer for animation functions */
+ if (game_status == GAME_MODE_PLAYING &&
+ level.game_engine_type == GAME_ENGINE_TYPE_EM)
+ {
+ BlitScreenToBitmap_EM(backbuffer);
+
+ return;
+ }
+
+ /* fill empty backbuffer for animation functions */
if (setup.direct_draw && game_status == GAME_MODE_PLAYING)
{
int xx, yy;
if (setup.direct_draw && game_status == GAME_MODE_PLAYING)
{
int xx, yy;
@@
-51,16
+59,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()
@@
-74,7
+73,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;