fixed incorrect canvase for opengl-scaled savestate thumbnail; rebuild free objects after restoring and remapping the coop players
This commit is contained in:
parent
e6841439b0
commit
ef8c3bc436
|
@ -1,5 +1,9 @@
|
|||
D2X-Rebirth Changelog
|
||||
|
||||
20120518
|
||||
--------
|
||||
main/state.c: fixed incorrect canvase for opengl-scaled savestate thumbnail; rebuild free objects after restoring and remapping the coop players
|
||||
|
||||
20120516
|
||||
--------
|
||||
main/game.c: In Multiplayer when taking damage, the game will only leave menus when shield drop below 5
|
||||
|
|
|
@ -538,7 +538,11 @@ int state_callback(newmenu *menu, d_event *event, grs_bitmap *sc_bmp[])
|
|||
{
|
||||
if ( sc_bmp[citem-1] ) {
|
||||
grs_canvas *save_canv = grd_curcanv;
|
||||
#ifndef OGL
|
||||
grs_canvas *temp_canv = gr_create_canvas(FSPACX(THUMBNAIL_W),FSPACY(THUMBNAIL_H));
|
||||
#else
|
||||
grs_canvas *temp_canv = gr_create_canvas(THUMBNAIL_W*2,(THUMBNAIL_H*24/10));
|
||||
#endif
|
||||
grs_point vertbuf[3] = {{0,0}, {0,0}, {i2f(THUMBNAIL_W*2),i2f(THUMBNAIL_H*24/10)} };
|
||||
gr_set_current_canvas(temp_canv);
|
||||
scale_bitmap(sc_bmp[citem-1], vertbuf, 0);
|
||||
|
@ -1697,6 +1701,7 @@ int state_restore_all_sub(char *filename, int secret_restore)
|
|||
if (!coop_player_got[i] && Players[i].connected == CONNECT_PLAYING)
|
||||
multi_disconnect_player(i);
|
||||
Viewer = ConsoleObject = &Objects[Players[Player_num].objnum]; // make sure Viewer and ConsoleObject are set up (which we skipped by not using InitPlayerObject but we need since objects changed while loading)
|
||||
special_reset_objects(); // since we juggeled around with objects to remap coop players rebuild the index of free objects
|
||||
}
|
||||
|
||||
PHYSFS_close(fp);
|
||||
|
|
Loading…
Reference in a new issue