summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2013-10-08 00:53:58 +0000
committerSimon Howard2013-10-08 00:53:58 +0000
commit2f256359cf616ad2a077bcad132691d5ce99e546 (patch)
treee480b2e10dbdf4806cc90bbea95e9bee60d70e55
parentd4f9e828f61f3c6d02f646f0646e9dbecbb76a49 (diff)
downloadchocolate-doom-2f256359cf616ad2a077bcad132691d5ce99e546.tar.gz
chocolate-doom-2f256359cf616ad2a077bcad132691d5ce99e546.tar.bz2
chocolate-doom-2f256359cf616ad2a077bcad132691d5ce99e546.zip
Set window title/icon for Heretic/Hexen startup windows, to match the
main game window. Subversion-branch: /branches/v2-branch Subversion-revision: 2696
-rw-r--r--src/heretic/d_main.c6
-rw-r--r--src/hexen/st_start.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 6dc29cf7..5d9def79 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -250,7 +250,6 @@ void D_DoomLoop(void)
sprintf(filename, "debug%i.txt", consoleplayer);
debugfile = fopen(filename, "w");
}
- I_SetWindowTitle(gamedescription);
I_GraphicsCheckCommandLine();
I_InitGraphics();
I_SetGrabMouseCallback(D_GrabMouseCallback);
@@ -638,6 +637,9 @@ void initStartup(void)
return;
}
+ I_InitWindowTitle();
+ I_InitWindowIcon();
+
// Blit main screen
textScreen = TXT_GetScreenData();
loading = W_CacheLumpName(DEH_String("LOADING"), PU_CACHE);
@@ -1021,6 +1023,8 @@ void D_DoomMain(void)
gamedescription = "Heretic (registered)";
}
+ I_SetWindowTitle(gamedescription);
+
savegamedir = M_GetSaveGameDir("heretic.wad");
I_PrintStartupBanner(gamedescription);
diff --git a/src/hexen/st_start.c b/src/hexen/st_start.c
index 391e26a6..58df878e 100644
--- a/src/hexen/st_start.c
+++ b/src/hexen/st_start.c
@@ -32,6 +32,7 @@
#include "h2def.h"
#include "i_system.h"
+#include "i_video.h"
#include "i_videohr.h"
#include "s_sound.h"
#include "st_start.h"
@@ -137,6 +138,7 @@ void ST_Init(void)
if (I_SetVideoModeHR())
{
using_graphical_startup = true;
+ I_InitWindowIcon();
S_StartSongName("orb", true);