Fix window title in EDUKE32_STANDALONE builds. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@6169 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-06-09 06:41:39 +00:00
parent 0447c0feb6
commit f394f1bc1e
2 changed files with 15 additions and 3 deletions

View file

@ -5442,7 +5442,11 @@ void G_UpdateAppTitle(void)
{ {
if (g_gameNamePtr) if (g_gameNamePtr)
{ {
#ifdef EDUKE32_STANDALONE
Bstrcpy(tempbuf, g_gameNamePtr);
#else
Bsprintf(tempbuf, "%s - " APPNAME, g_gameNamePtr); Bsprintf(tempbuf, "%s - " APPNAME, g_gameNamePtr);
#endif
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);
} }
else else

View file

@ -1849,15 +1849,24 @@ int G_EnterLevel(int gameMode)
if (G_HaveUserMap()) if (G_HaveUserMap())
{ {
Bstrcpy(levelName, boardfilename); Bstrcpy(levelName, boardfilename);
if (g_gameNamePtr) if (g_gameNamePtr)
Bsprintf(apptitle,"%s - %s - " APPNAME,levelName,g_gameNamePtr); #ifdef EDUKE32_STANDALONE
Bsprintf(apptitle,"%s - %s",levelName,g_gameNamePtr);
#else
Bsprintf(apptitle, "%s - %s - " APPNAME, levelName, g_gameNamePtr);
#endif
else else
Bsprintf(apptitle,"%s - " APPNAME,levelName); Bsprintf(apptitle,"%s - " APPNAME,levelName);
} }
else else
{ {
if (g_gameNamePtr) if (g_gameNamePtr)
Bsprintf(apptitle,"%s - %s - " APPNAME,g_mapInfo[mii].name,g_gameNamePtr); #ifdef EDUKE32_STANDALONE
Bsprintf(apptitle,"%s - %s",g_mapInfo[mii].name,g_gameNamePtr);
#else
Bsprintf(apptitle, "%s - %s - " APPNAME, g_mapInfo[mii].name, g_gameNamePtr);
#endif
else else
Bsprintf(apptitle,"%s - " APPNAME,g_mapInfo[mii].name); Bsprintf(apptitle,"%s - " APPNAME,g_mapInfo[mii].name);
} }
@ -1865,7 +1874,6 @@ int G_EnterLevel(int gameMode)
Bstrcpy(tempbuf,apptitle); Bstrcpy(tempbuf,apptitle);
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);
/***** Load the map *****/
DukePlayer_t *const pPlayer = g_player[0].ps; DukePlayer_t *const pPlayer = g_player[0].ps;
if (!VOLUMEONE && G_HaveUserMap()) if (!VOLUMEONE && G_HaveUserMap())