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

Remove canvas juggling in save_screen_shot

Browse source
This commit is contained in:
Kp 2017-04-08 16:48:19 +00:00
parent d827e73de9
commit 94fe1117d7
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
similar/main/game.cpp
View file

@ -286,7 +286,6 @@ int set_screen_mode(int sm)
{
if ( (Screen_mode == sm) && !((sm==SCREEN_GAME) && (grd_curscreen->get_screen_mode() != Game_screen_mode)) && !(sm==SCREEN_MENU) )
{
gr_set_current_canvas(NULL);
return 1;
}
@ -340,9 +339,6 @@ int set_screen_mode(int sm)
default:
Error("Invalid screen mode %d",sm);
}
gr_set_current_canvas(NULL);
return 1;
}
@ -550,21 +546,15 @@ void save_screen_shot(int automap_flag)
write_bmp(savename, grd_curscreen->get_screen_width(), grd_curscreen->get_screen_height());
#else
grs_canvas *screen_canv=&grd_curscreen->sc_canvas;
grs_canvas *save_canv;
grs_canvas &screen_canv = grd_curscreen->sc_canvas;
palette_array_t pal;
save_canv = grd_curcanv;
auto temp_canv = gr_create_canvas(screen_canv->cv_bitmap.bm_w,screen_canv->cv_bitmap.bm_h);
gr_set_current_canvas(temp_canv);
gr_ubitmap(*grd_curcanv, screen_canv->cv_bitmap);
gr_set_current_canvas(NULL);
const auto &&temp_canv = gr_create_canvas(screen_canv.cv_bitmap.bm_w, screen_canv.cv_bitmap.bm_h);
gr_ubitmap(*temp_canv, screen_canv.cv_bitmap);
gr_palette_read(pal); //get actual palette from the hardware
pcx_write_bitmap(savename,&temp_canv->cv_bitmap,pal);
gr_set_current_canvas(screen_canv);
gr_ubitmap(*grd_curcanv, temp_canv->cv_bitmap);
gr_set_current_canvas(save_canv);
gr_ubitmap(screen_canv, temp_canv->cv_bitmap);
#endif
}