TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass gr_set_bitmap_data grs_bitmap by &

Browse source
This commit is contained in:
Kp 2014-11-30 22:09:20 +00:00
parent 97332b848c
commit 0672cdff1b
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/2d/bitmap.cpp
View file

@ -38,12 +38,12 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
// Allocated a bitmap and makes its data be raw_data that is already somewhere.
static grs_bitmap_ptr gr_create_bitmap_raw(uint16_t w, uint16_t h, unsigned char * raw_data);
void gr_set_bitmap_data (grs_bitmap *bm, unsigned char *data)
void gr_set_bitmap_data (grs_bitmap &bm, unsigned char *data)
{
#ifdef OGL
ogl_freebmtexture(*bm);
ogl_freebmtexture(bm);
#endif
bm->bm_data = data;
bm.bm_data = data;
}
grs_bitmap_ptr gr_create_bitmap(uint16_t w, uint16_t h )
@ -74,7 +74,7 @@ void gr_init_bitmap( grs_bitmap *bm, uint8_t mode, uint16_t x, uint16_t y, uint1
#ifdef OGL
bm->bm_parent=NULL;bm->gltexture=NULL;
#endif
gr_set_bitmap_data (bm, data);
gr_set_bitmap_data (*bm, data);
}
void gr_init_bitmap_alloc( grs_bitmap *bm, uint8_t mode, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t bytesperline)

2
common/include/gr.h
View file

@ -268,7 +268,7 @@ void gr_bm_ubitbltm(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * s
void gr_set_bitmap_flags(grs_bitmap *pbm, uint8_t flags);
void gr_set_transparent(grs_bitmap *pbm, int bTransparent);
void gr_set_super_transparent(grs_bitmap *pbm, int bTransparent);
void gr_set_bitmap_data(grs_bitmap *bm, unsigned char *data);
void gr_set_bitmap_data(grs_bitmap &bm, unsigned char *data);
//=========================================================================
// Color functions:

2
d1x-rebirth/main/custom.cpp
View file

@ -576,7 +576,7 @@ static void custom_remove()
{
GameBitmapOffset[i] = (int)(size_t)BitmapOriginal[i].bm_data;
gr_set_bitmap_flags(bmp, BM_FLAG_PAGED_OUT);
gr_set_bitmap_data(bmp, Piggy_bitmap_cache_data);
gr_set_bitmap_data(*bmp, Piggy_bitmap_cache_data);
}
else
{

22
similar/main/piggy.cpp
View file

@ -798,7 +798,7 @@ void piggy_new_pigfile(char *pigname)
strcpy(AllBitmaps[i].name,temp_name);
width = bmh.width + ((short) (bmh.wh_extra & 0x0f) << 8);
gr_set_bitmap_data(bm, NULL); // free ogl texture
gr_set_bitmap_data(*bm, NULL); // free ogl texture
gr_init_bitmap(bm, 0, 0, 0, width, bmh.height + ((short) (bmh.wh_extra & 0xf0) << 4), width, NULL);
bm->bm_flags = BM_FLAG_PAGED_OUT;
bm->avg_color = bmh.avg_color;
@ -1338,7 +1338,7 @@ void piggy_bitmap_page_in( bitmap_index bitmap )
gr_set_bitmap_flags (bmp, GameBitmapFlags[i]);
#if defined(DXX_BUILD_DESCENT_I)
gr_set_bitmap_data (bmp, &Piggy_bitmap_cache_data [Piggy_bitmap_cache_next]);
gr_set_bitmap_data (*bmp, &Piggy_bitmap_cache_data [Piggy_bitmap_cache_next]);
#endif
if ( bmp->bm_flags & BM_FLAG_RLE ) {
@ -1372,7 +1372,7 @@ void piggy_bitmap_page_in( bitmap_index bitmap )
}
PHYSFS_read( Piggy_fp, &Piggy_bitmap_cache_data[Piggy_bitmap_cache_next+4], 1, zsize-4 );
*((int *) (Piggy_bitmap_cache_data + Piggy_bitmap_cache_next)) = INTEL_INT(zsize);
gr_set_bitmap_data(bmp, &Piggy_bitmap_cache_data[Piggy_bitmap_cache_next]);
gr_set_bitmap_data(*bmp, &Piggy_bitmap_cache_data[Piggy_bitmap_cache_next]);
#ifndef MACDATA
switch (pigsize) {
@ -1414,7 +1414,7 @@ void piggy_bitmap_page_in( bitmap_index bitmap )
swap_0_255(bmp);
#elif defined(DXX_BUILD_DESCENT_II)
int pigsize = PHYSFS_fileLength(Piggy_fp);
gr_set_bitmap_data(bmp, &Piggy_bitmap_cache_data[Piggy_bitmap_cache_next]);
gr_set_bitmap_data(*bmp, &Piggy_bitmap_cache_data[Piggy_bitmap_cache_next]);
Piggy_bitmap_cache_next+=bmp->bm_h*bmp->bm_w;
#ifndef MACDATA
@ -1478,9 +1478,9 @@ void piggy_bitmap_page_out_all()
if ( GameBitmapOffset[i] > 0 ) { // Don't page out bitmaps read from disk!!!
GameBitmaps[i].bm_flags = BM_FLAG_PAGED_OUT;
#if defined(DXX_BUILD_DESCENT_I)
gr_set_bitmap_data (&GameBitmaps[i], Piggy_bitmap_cache_data);
gr_set_bitmap_data (GameBitmaps[i], Piggy_bitmap_cache_data);
#elif defined(DXX_BUILD_DESCENT_II)
gr_set_bitmap_data(&GameBitmaps[i], NULL);
gr_set_bitmap_data(GameBitmaps[i], NULL);
#endif
}
}
@ -1784,7 +1784,7 @@ void load_bitmap_replacements(const char *level_name)
DiskBitmapHeader_read(&bmh, ifile);
width = bmh.width + ((short) (bmh.wh_extra & 0x0f) << 8);
gr_set_bitmap_data(bm, NULL); // free ogl texture
gr_set_bitmap_data(*bm, NULL); // free ogl texture
gr_init_bitmap(bm, 0, 0, 0, width, bmh.height + ((short) (bmh.wh_extra & 0xf0) << 4), width, NULL);
bm->avg_color = bmh.avg_color;
bm->bm_data = (ubyte *) (size_t)bmh.offset;
@ -1799,7 +1799,7 @@ void load_bitmap_replacements(const char *level_name)
for (i = 0; i < n_bitmaps; i++)
{
grs_bitmap *bm = &GameBitmaps[indices[i]];
gr_set_bitmap_data(bm, &Bitmap_replacement_data[(size_t) bm->bm_data]);
gr_set_bitmap_data(*bm, &Bitmap_replacement_data[(size_t) bm->bm_data]);
}
PHYSFS_close(ifile);
@ -1841,7 +1841,7 @@ static void bitmap_read_d1( grs_bitmap *bitmap, /* read into this bitmap */
int width;
width = bmh->width + ((short) (bmh->wh_extra & 0x0f) << 8);
gr_set_bitmap_data(bitmap, NULL); // free ogl texture
gr_set_bitmap_data(*bitmap, NULL); // free ogl texture
gr_init_bitmap(bitmap, 0, 0, 0, width, bmh->height + ((short) (bmh->wh_extra & 0xf0) << 4), width, NULL);
bitmap->avg_color = bmh->avg_color;
gr_set_bitmap_flags(bitmap, bmh->flags & BM_FLAGS_TO_COPY);
@ -1862,7 +1862,7 @@ static void bitmap_read_d1( grs_bitmap *bitmap, /* read into this bitmap */
if (!data) return;
PHYSFS_read(d1_Piggy_fp, data, 1, zsize);
gr_set_bitmap_data(bitmap, data);
gr_set_bitmap_data(*bitmap, data);
switch(pigsize) {
case D1_MAC_PIGSIZE:
case D1_MAC_SHARE_PIGSIZE:
@ -2119,7 +2119,7 @@ void load_d1_bitmap_replacements()
for (i = 0; i < Num_bitmap_files; i++)
if (i != d2_index && ! memcmp(AllBitmaps[d2_index].name, AllBitmaps[i].name, len))
{
gr_set_bitmap_data(&GameBitmaps[i], NULL); // free ogl texture
gr_set_bitmap_data(GameBitmaps[i], NULL); // free ogl texture
GameBitmaps[i] = GameBitmaps[d2_index];
GameBitmapOffset[i] = 0;
GameBitmapFlags[i] = bmh.flags;