projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd8521b
)
changed function for re-creating bitmaps to always use default depth
author
Holger Schemel
<info@artsoft.org>
Tue, 31 May 2016 18:55:05 +0000
(20:55 +0200)
committer
Holger Schemel
<info@artsoft.org>
Tue, 31 May 2016 18:55:05 +0000
(20:55 +0200)
src/game_em/init.c
patch
|
blob
|
history
src/game_sp/init.c
patch
|
blob
|
history
src/init.c
patch
|
blob
|
history
src/libgame/sdl.c
patch
|
blob
|
history
src/libgame/system.c
patch
|
blob
|
history
src/libgame/system.h
patch
|
blob
|
history
diff --git
a/src/game_em/init.c
b/src/game_em/init.c
index 719f5e13db13e096b58dd1ca51491cecdbb31f17..0d4c31396b6f0a3f6dd0b12b03ba3fd8af9c9663 100644
(file)
--- a/
src/game_em/init.c
+++ b/
src/game_em/init.c
@@
-41,8
+41,7
@@
int open_all(void)
void InitGfxBuffers_EM()
{
void InitGfxBuffers_EM()
{
- ReCreateBitmap(&screenBitmap, MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY,
- DEFAULT_DEPTH);
+ ReCreateBitmap(&screenBitmap, MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY);
global_em_info.screenbuffer = screenBitmap;
}
global_em_info.screenbuffer = screenBitmap;
}
diff --git
a/src/game_sp/init.c
b/src/game_sp/init.c
index b515020cd669d91c9ca18db87d6fb536f6a67d83..c1dbc3e4f7f9109dbf9a0ba0fb99c087bcc93ea4 100644
(file)
--- a/
src/game_sp/init.c
+++ b/
src/game_sp/init.c
@@
-80,7
+80,7
@@
void InitPrecedingPlayfieldMemory()
void InitGfxBuffers_SP()
{
void InitGfxBuffers_SP()
{
- ReCreateBitmap(&bitmap_db_field_sp, FXSIZE, FYSIZE
, DEFAULT_DEPTH
);
+ ReCreateBitmap(&bitmap_db_field_sp, FXSIZE, FYSIZE);
}
unsigned int InitEngineRandom_SP(int seed)
}
unsigned int InitEngineRandom_SP(int seed)
diff --git
a/src/init.c
b/src/init.c
index ba6ea4966f37da6e393a3c4dd1a6060cec4f7f24..770d88c82c9818512a5ee2eb2f48795a9dd0831d 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-5165,17
+5165,17
@@
void InitGfxBuffers()
if (WIN_XSIZE != win_xsize_last || WIN_YSIZE != win_ysize_last)
{
/* used to temporarily store the backbuffer -- only re-create if changed */
if (WIN_XSIZE != win_xsize_last || WIN_YSIZE != win_ysize_last)
{
/* used to temporarily store the backbuffer -- only re-create if changed */
- ReCreateBitmap(&bitmap_db_store_1, WIN_XSIZE, WIN_YSIZE
, DEFAULT_DEPTH
);
- ReCreateBitmap(&bitmap_db_store_2, WIN_XSIZE, WIN_YSIZE
, DEFAULT_DEPTH
);
+ ReCreateBitmap(&bitmap_db_store_1, WIN_XSIZE, WIN_YSIZE);
+ ReCreateBitmap(&bitmap_db_store_2, WIN_XSIZE, WIN_YSIZE);
win_xsize_last = WIN_XSIZE;
win_ysize_last = WIN_YSIZE;
}
win_xsize_last = WIN_XSIZE;
win_ysize_last = WIN_YSIZE;
}
- ReCreateBitmap(&bitmap_db_field, FXSIZE, FYSIZE
, DEFAULT_DEPTH
);
- ReCreateBitmap(&bitmap_db_panel, DXSIZE, DYSIZE
, DEFAULT_DEPTH
);
- ReCreateBitmap(&bitmap_db_door_1, 3 * DXSIZE, DYSIZE
, DEFAULT_DEPTH
);
- ReCreateBitmap(&bitmap_db_door_2, 3 * VXSIZE, VYSIZE
, DEFAULT_DEPTH
);
+ ReCreateBitmap(&bitmap_db_field, FXSIZE, FYSIZE);
+ ReCreateBitmap(&bitmap_db_panel, DXSIZE, DYSIZE);
+ ReCreateBitmap(&bitmap_db_door_1, 3 * DXSIZE, DYSIZE);
+ ReCreateBitmap(&bitmap_db_door_2, 3 * VXSIZE, VYSIZE);
/* initialize screen properties */
InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
/* initialize screen properties */
InitGfxFieldInfo(SX, SY, SXSIZE, SYSIZE,
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index a860eeb9e988656a0d26ffbb46f2dd1f04ea346f..9b44b372a0965fb73e3d9c7e422812f21ae7161a 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-431,7
+431,7
@@
void SDLInitVideoBuffer(boolean fullscreen)
should never be drawn to directly, it would do no harm nevertheless. */
/* create additional (symbolic) buffer for double-buffering */
should never be drawn to directly, it would do no harm nevertheless. */
/* create additional (symbolic) buffer for double-buffering */
- ReCreateBitmap(&window, video.width, video.height
, video.depth
);
+ ReCreateBitmap(&window, video.width, video.height);
}
static boolean SDLCreateScreen(boolean fullscreen)
}
static boolean SDLCreateScreen(boolean fullscreen)
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index acd36018b2614036196301205967ab4e581f6e5b..600b4b3217a6ad785ccc3f1b4608c824fa4149f7 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-203,16
+203,16
@@
void InitGfxWindowInfo(int win_xsize, int win_ysize)
{
if (win_xsize != gfx.win_xsize || win_ysize != gfx.win_ysize)
{
{
if (win_xsize != gfx.win_xsize || win_ysize != gfx.win_ysize)
{
- ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize
, DEFAULT_DEPTH
);
+ ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize);
#if defined(TARGET_SDL2)
#if defined(TARGET_SDL2)
- ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize
, DEFAULT_DEPTH
);
+ ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize);
#endif
#endif
- ReCreateBitmap(&gfx.fade_bitmap_backup, win_xsize, win_ysize
, DEFAULT_DEPTH
);
- ReCreateBitmap(&gfx.fade_bitmap_source, win_xsize, win_ysize
, DEFAULT_DEPTH
);
- ReCreateBitmap(&gfx.fade_bitmap_target, win_xsize, win_ysize
, DEFAULT_DEPTH
);
- ReCreateBitmap(&gfx.fade_bitmap_black, win_xsize, win_ysize
, DEFAULT_DEPTH
);
+ ReCreateBitmap(&gfx.fade_bitmap_backup, win_xsize, win_ysize);
+ ReCreateBitmap(&gfx.fade_bitmap_source, win_xsize, win_ysize);
+ ReCreateBitmap(&gfx.fade_bitmap_target, win_xsize, win_ysize);
+ ReCreateBitmap(&gfx.fade_bitmap_black, win_xsize, win_ysize);
ClearRectangle(gfx.fade_bitmap_black, 0, 0, win_xsize, win_ysize);
}
ClearRectangle(gfx.fade_bitmap_black, 0, 0, win_xsize, win_ysize);
}
@@
-444,9
+444,9
@@
Bitmap *CreateBitmap(int width, int height, int depth)
return new_bitmap;
}
return new_bitmap;
}
-void ReCreateBitmap(Bitmap **bitmap, int width, int height
, int depth
)
+void ReCreateBitmap(Bitmap **bitmap, int width, int height)
{
{
- Bitmap *new_bitmap = CreateBitmap(width, height,
depth
);
+ Bitmap *new_bitmap = CreateBitmap(width, height,
DEFAULT_DEPTH
);
if (*bitmap == NULL)
{
if (*bitmap == NULL)
{
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 109cca0eaaad3b84192d0d1a34bf6dc53c9f6737..97fed8a27063cefca1b2c2b7729e1b8f5ecfcecb 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-1385,7
+1385,7
@@
void CloseVideoDisplay(void);
void InitVideoBuffer(int, int, int, boolean);
Bitmap *CreateBitmapStruct(void);
Bitmap *CreateBitmap(int, int, int);
void InitVideoBuffer(int, int, int, boolean);
Bitmap *CreateBitmapStruct(void);
Bitmap *CreateBitmap(int, int, int);
-void ReCreateBitmap(Bitmap **, int, int
, int
);
+void ReCreateBitmap(Bitmap **, int, int);
void FreeBitmap(Bitmap *);
void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
void BlitBitmapTiled(Bitmap *, Bitmap *, int, int, int, int, int, int, int,int);
void FreeBitmap(Bitmap *);
void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
void BlitBitmapTiled(Bitmap *, Bitmap *, int, int, int, int, int, int, int,int);