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

Pass gr_init_bitmap_data arg by &

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

8
common/2d/bitmap.cpp
View file

@ -84,12 +84,12 @@ void gr_init_bitmap_alloc( grs_bitmap *bm, uint8_t mode, uint16_t x, uint16_t y,
gr_init_bitmap(bm, mode, x, y, w, h, bytesperline, d);
}
void gr_init_bitmap_data (grs_bitmap *bm) // TODO: virtulize
void gr_init_bitmap_data (grs_bitmap &bm) // TODO: virtulize
{
bm->bm_data = NULL;
bm->bm_parent=NULL;
bm.bm_data = nullptr;
bm.bm_parent = nullptr;
#ifdef OGL
bm->gltexture=NULL;
bm.gltexture = nullptr;
#endif
}

2
common/include/gr.h
View file

@ -258,7 +258,7 @@ grs_subbitmap_ptr gr_create_sub_bitmap(grs_bitmap *bm,uint16_t x,uint16_t y,uint
// Free the bitmap's data
void gr_free_bitmap_data (grs_bitmap &bm);
void gr_init_bitmap_data (grs_bitmap *bm);
void gr_init_bitmap_data (grs_bitmap &bm);
void gr_bm_pixel( grs_bitmap * bm, int x, int y, unsigned char color );
void gr_bm_bitblt(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);

2
similar/main/automap.cpp
View file

@ -957,7 +957,7 @@ void do_automap()
// ZICO - code from above to show frame in OGL correctly. Redundant, but better readable.
// KREATOR - Now applies to all platforms so double buffering is supported
gr_init_bitmap_data (&am->automap_background);
gr_init_bitmap_data(am->automap_background);
pcx_error = pcx_read_bitmap(MAP_BACKGROUND_FILENAME, &am->automap_background, BM_LINEAR, pal);
if (pcx_error != PCX_ERROR_NONE)
Error("File %s - PCX error: %s", MAP_BACKGROUND_FILENAME, pcx_errormsg(pcx_error));

5
similar/main/endlevel.cpp
View file

@ -270,9 +270,8 @@ void init_endlevel()
//!! destroyed_exit_modelnum = load_polygon_model("exit01d.pof",1,exit_bitmap_list,NULL);
generate_starfield();
gr_init_bitmap_data (&terrain_bm_instance);
gr_init_bitmap_data (&satellite_bm_instance);
gr_init_bitmap_data(terrain_bm_instance);
gr_init_bitmap_data(satellite_bm_instance);
}
static object *external_explosion;

3
similar/main/gameseq.cpp
View file

@ -949,8 +949,7 @@ static void do_screen_message(const char *msg)
if (Game_mode & GM_MULTI)
return;
gr_init_bitmap_data(&background);
gr_init_bitmap_data(background);
if (pcx_read_bitmap(GLITZ_BACKGROUND, &background, BM_LINEAR, gr_palette) != PCX_ERROR_NONE)
return;

2
similar/main/iff.cpp
View file

@ -972,7 +972,7 @@ int iff_read_animbrush(const char *ifilename,array<std::unique_ptr<grs_bitmap>,
prev_bm = *n_bitmaps>0?bm_list[*n_bitmaps-1].get() : nullptr;
bm_list[*n_bitmaps] = make_unique<grs_bitmap>();
gr_init_bitmap_data (bm_list[*n_bitmaps].get());
gr_init_bitmap_data(*bm_list[*n_bitmaps].get());
ret = iff_parse_bitmap(ifile,bm_list[*n_bitmaps].get(),form_type,*n_bitmaps>0 ? nullptr : &palette,prev_bm);

2
similar/main/kmatrix.cpp
View file

@ -370,7 +370,7 @@ void kmatrix_view(int network)
{
window *wind;
kmatrix_screen km;
gr_init_bitmap_data(&km.background);
gr_init_bitmap_data(km.background);
if (pcx_read_bitmap(STARS_BACKGROUND, &km.background, BM_LINEAR, gr_palette) != PCX_ERROR_NONE)
{
return;

4
similar/main/newmenu.cpp
View file

@ -123,7 +123,7 @@ static void nm_draw_background1(const char * filename)
{
if (nm_background1.bm_data == NULL)
{
gr_init_bitmap_data (&nm_background1);
gr_init_bitmap_data(nm_background1);
pcx_error = pcx_read_bitmap( filename, &nm_background1, BM_LINEAR, gr_palette );
Assert(pcx_error == PCX_ERROR_NONE);
(void)pcx_error;
@ -151,7 +151,7 @@ void nm_draw_background(int x1, int y1, int x2, int y2 )
{
int pcx_error;
palette_array_t background_palette;
gr_init_bitmap_data (&nm_background);
gr_init_bitmap_data(nm_background);
pcx_error = pcx_read_bitmap(MENU_BACKGROUND_BITMAP,&nm_background,BM_LINEAR,background_palette);
Assert(pcx_error == PCX_ERROR_NONE);
(void)pcx_error;

14
similar/main/titles.cpp
View file

@ -170,9 +170,7 @@ static int show_title_screen(const char * filename, int allow_keys, int from_hog
strcat(new_filename,filename);
filename = new_filename;
gr_init_bitmap_data (&ts->title_bm);
gr_init_bitmap_data(ts->title_bm);
if ((pcx_error=pcx_read_bitmap( filename, &ts->title_bm, BM_LINEAR, gr_palette ))!=PCX_ERROR_NONE) {
Error( "Error loading briefing screen <%s>, PCX load error: %s (%i)\n",filename, pcx_errormsg(pcx_error), pcx_error);
}
@ -492,7 +490,7 @@ static void briefing_init(briefing *br, short level_num)
br->cur_screen = 0;
br->screen = NULL;
gr_init_bitmap_data (&br->background);
gr_init_bitmap_data(br->background);
strncpy(br->background_name, DEFAULT_BRIEFING_BKG, sizeof(br->background_name));
#if defined(DXX_BUILD_DESCENT_II)
br->hum_channel = br->printing_channel = -1;
@ -818,7 +816,7 @@ static int briefing_process_char(briefing *br)
br->robot_canv.reset();
get_message_name(&br->message, bitmap_name);
strcat(bitmap_name, ".bbm");
gr_init_bitmap_data (&br->guy_bitmap);
gr_init_bitmap_data(br->guy_bitmap);
iff_error = iff_read_bitmap(bitmap_name, &br->guy_bitmap, BM_LINEAR, &temp_palette);
Assert(iff_error == IFF_NO_ERROR);
(void)iff_error;
@ -1230,8 +1228,7 @@ static int load_briefing_screen(briefing *br, const char *fname)
if (!PHYSFSX_exists(fname2,1))
snprintf(fname2, sizeof(char)*PATH_MAX, "%s", fname);
}
gr_init_bitmap_data(&br->background);
gr_init_bitmap_data(br->background);
if (d_stricmp(br->background_name, fname2))
strncpy (br->background_name,fname2, sizeof(br->background_name));
@ -1277,8 +1274,7 @@ static int load_briefing_screen(briefing *br, const char *fname)
int pcx_error;
free_briefing_screen(br);
gr_init_bitmap_data(&br->background);
gr_init_bitmap_data(br->background);
if (d_stricmp(br->background_name, fname))
strncpy (br->background_name,fname, sizeof(br->background_name));