From 28e6c029ce3ade7f82516dcba3ec8f364c84c633 Mon Sep 17 00:00:00 2001 From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0> Date: Thu, 19 Oct 2006 17:16:35 +0000 Subject: [PATCH] Move the window title setting code to the beginning of enterlevel(), so that it updates before the loading screen is displayed rather than after git-svn-id: https://svn.eduke32.com/eduke32@319 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/premap.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c index 70b3771a4..517c4d064 100644 --- a/polymer/eduke32/source/premap.c +++ b/polymer/eduke32/source/premap.c @@ -1514,6 +1514,19 @@ int enterlevel(char g) if( (g&MODE_DEMO) == 0 && ud.recstat == 2) ud.recstat = 0; + if (VOLUMEALL) Bsprintf(tempbuf,HEAD2); + else Bsprintf(tempbuf,HEAD); + + if( boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0 ) + { + Bstrcpy(levname, boardfilename); + Bsprintf(apptitle," - %s",levname); + } + else Bsprintf(apptitle," - %s",level_names[(ud.volume_number*11)+ud.level_number]); + + Bstrcat(tempbuf,apptitle); + wm_setapptitle(tempbuf); + FX_StopAllSounds(); clearsoundlocks(); FX_SetReverb(0); @@ -1673,19 +1686,6 @@ int enterlevel(char g) //AddLog(g_szBuf); // variables are set by pointer... - if (VOLUMEALL) Bsprintf(tempbuf,HEAD2); - else Bsprintf(tempbuf,HEAD); - - if( boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0 ) - { - Bstrcpy(levname, boardfilename); - Bsprintf(apptitle," - %s",levname); - } - else Bsprintf(apptitle," - %s",level_names[(ud.volume_number*11)+ud.level_number]); - - Bstrcat(tempbuf,apptitle); - wm_setapptitle(tempbuf); - OnEvent(EVENT_ENTERLEVEL, -1, -1, -1); return 0; }