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

No showing the main menu background between loading a level and playing it, fixing palette issue when autoplaying a demo

Browse source
This commit is contained in:
kreatordxx 2010-02-05 08:53:20 +00:00
parent b58c034350
commit 7c083d0834
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -3,6 +3,7 @@ D1X-Rebirth Changelog
20100205
--------
main/game.c, main/gameseq.c, main/newdemo.c: Use palette_save and palette_restore for all windows displayed over Game_wind, not just for do_option
main/gameseq.c, main/newmenu.c: No showing the main menu background between loading a level and playing it (syncing with D2X)
20100202
--------

7
main/gameseq.c
View file

@ -878,6 +878,7 @@ void DoEndLevelScoreGlitz(int network)
int i,c;
char title[128];
int is_last_level;
int fmode;
gr_palette_load( gr_palette );
@ -947,12 +948,15 @@ void DoEndLevelScoreGlitz(int network)
Assert(c <= N_GLITZITEMS);
fmode = Function_mode;
Function_mode = FMODE_MENU; // hack to get Menu_pcx_name to actually show
#ifdef NETWORK
if ( network && (Game_mode & GM_NETWORK) )
newmenu_do2(NULL, title, c, m, multi_endlevel_poll1, NULL, 0, Menu_pcx_name);
else
#endif // Note link!
newmenu_do2(NULL, title, c, m, NULL, NULL, 0, Menu_pcx_name);
Function_mode = fmode;
}
//called when the player has finished a level
@ -967,11 +971,14 @@ void PlayerFinishedLevel(int secret_flag)
#ifndef SHAREWARE
if (!(Game_mode & GM_MULTI) && (secret_flag)) {
newmenu_item m[1];
int fmode = Function_mode;
m[0].type = NM_TYPE_TEXT;
m[0].text = " "; //TXT_SECRET_EXIT;
Function_mode = FMODE_MENU;
newmenu_do2(NULL, TXT_SECRET_EXIT, 1, m, NULL, NULL, 0, Menu_pcx_name);
Function_mode = fmode;
}
#endif

5
main/newmenu.c
View file

@ -128,8 +128,11 @@ void nm_draw_background1(char * filename)
{
int pcx_error;
if (filename == NULL && Function_mode == FMODE_MENU)
if (filename == NULL)
filename = Menu_pcx_name;
if (!strcmp(filename, Menu_pcx_name) && Function_mode != FMODE_MENU)
return;
if (filename != NULL)
{