moved gr_palette_load() in nm_draw_background so it always does apply and resets step-ups properly
This commit is contained in:
parent
95b08dfb17
commit
61933261c2
|
@ -1,5 +1,9 @@
|
|||
D1X-Rebirth Changelog
|
||||
|
||||
20070401
|
||||
--------
|
||||
main/newmenu.c: moved gr_palette_load() in nm_draw_background so it always does apply and resets step-ups properly
|
||||
|
||||
20070331
|
||||
--------
|
||||
main/menu.c: improved Error-handling for loading missions
|
||||
|
|
|
@ -257,7 +257,7 @@ int DoMenu()
|
|||
RegisterPlayer();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
if ((Game_mode & GM_SERIAL) || (Game_mode & GM_MODEM)) {
|
||||
do_option(MENU_START_SERIAL);
|
||||
return 0;
|
||||
|
|
|
@ -174,6 +174,9 @@ void nm_draw_background(int x1, int y1, int x2, int y2 )
|
|||
tmp=gr_create_sub_canvas(old,x1,y1,w,h);
|
||||
gr_init_sub_bitmap(&bg,&nm_background,0,0,w*(320.0/SWIDTH),h*(200.0/SHEIGHT));//note that we haven't replaced current_canvas yet, so these macros are still ok.
|
||||
gr_set_current_canvas(tmp);
|
||||
|
||||
gr_palette_load( gr_palette );
|
||||
|
||||
#ifdef OGL
|
||||
if (ogl_scissor_ok) {
|
||||
glEnable(GL_SCISSOR_TEST);
|
||||
|
|
Loading…
Reference in a new issue