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

Pass gr_create_sub_bitmap arg by &

Browse source
This commit is contained in:
Kp 2014-11-30 22:09:21 +00:00
parent ef539be1ab
commit d0abc13c94
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/2d/bitmap.cpp
View file

@ -94,10 +94,10 @@ void gr_init_bitmap_data (grs_bitmap &bm) // TODO: virtulize
#endif
}
grs_subbitmap_ptr gr_create_sub_bitmap(grs_bitmap *bm, uint16_t x, uint16_t y, uint16_t w, uint16_t h )
grs_subbitmap_ptr gr_create_sub_bitmap(grs_bitmap &bm, uint16_t x, uint16_t y, uint16_t w, uint16_t h)
{
grs_subbitmap_ptr n(new grs_bitmap);
gr_init_sub_bitmap(*n.get(), *bm, x, y, w, h);
gr_init_sub_bitmap(*n.get(), bm, x, y, w, h);
return n;
}

2
common/include/gr.h
View file

@ -254,7 +254,7 @@ struct subbitmap_delete : private std::default_delete<grs_bitmap>
typedef std::unique_ptr<grs_bitmap, subbitmap_delete> grs_subbitmap_ptr;
// Creates a bitmap which is part of another bitmap
grs_subbitmap_ptr gr_create_sub_bitmap(grs_bitmap *bm,uint16_t x,uint16_t y,uint16_t w, uint16_t h);
grs_subbitmap_ptr gr_create_sub_bitmap(grs_bitmap &bm, uint16_t x, uint16_t y, uint16_t w, uint16_t h);
// Free the bitmap's data
void gr_free_bitmap_data (grs_bitmap &bm);

4
similar/main/gauges.cpp
View file

@ -1806,8 +1806,8 @@ static void cockpit_decode_alpha(grs_bitmap *bm)
#ifdef OGL
ogl_ubitmapm_cs (0, 0, -1, -1, deccpt, 255, F1_0); // render one time to init the texture
#endif
WinBoxOverlay[0] = gr_create_sub_bitmap(&deccpt,(PRIMARY_W_BOX_LEFT)-2,(PRIMARY_W_BOX_TOP)-2,(PRIMARY_W_BOX_RIGHT-PRIMARY_W_BOX_LEFT+4),(PRIMARY_W_BOX_BOT-PRIMARY_W_BOX_TOP+4));
WinBoxOverlay[1] = gr_create_sub_bitmap(&deccpt,(SECONDARY_W_BOX_LEFT)-2,(SECONDARY_W_BOX_TOP)-2,(SECONDARY_W_BOX_RIGHT-SECONDARY_W_BOX_LEFT)+4,(SECONDARY_W_BOX_BOT-SECONDARY_W_BOX_TOP)+4);
WinBoxOverlay[0] = gr_create_sub_bitmap(deccpt,(PRIMARY_W_BOX_LEFT)-2,(PRIMARY_W_BOX_TOP)-2,(PRIMARY_W_BOX_RIGHT-PRIMARY_W_BOX_LEFT+4),(PRIMARY_W_BOX_BOT-PRIMARY_W_BOX_TOP+4));
WinBoxOverlay[1] = gr_create_sub_bitmap(deccpt,(SECONDARY_W_BOX_LEFT)-2,(SECONDARY_W_BOX_TOP)-2,(SECONDARY_W_BOX_RIGHT-SECONDARY_W_BOX_LEFT)+4,(SECONDARY_W_BOX_BOT-SECONDARY_W_BOX_TOP)+4);
cur = bm->bm_data;
cur_w = bm->bm_w;

2
similar/main/newmenu.cpp
View file

@ -183,7 +183,7 @@ void nm_draw_background(int x1, int y1, int x2, int y2 )
init_sub=1;
}
if (init_sub)
nm_background_sub = gr_create_sub_bitmap(&nm_background,0,0,w*(((float) nm_background.bm_w)/SWIDTH),h*(((float) nm_background.bm_h)/SHEIGHT));
nm_background_sub = gr_create_sub_bitmap(nm_background,0,0,w*(((float) nm_background.bm_w)/SWIDTH),h*(((float) nm_background.bm_h)/SHEIGHT));
show_fullscr( nm_background_sub.get() );
gr_set_current_canvas(old);