shithub: choc

Info  •  Files  •  Log  •  Branches

Set window title/icon for Heretic/Hexen startup windows, to match the
main game window.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2696

--- a/src/heretic/d_main.c

+++ b/src/heretic/d_main.c

@@ -250,7 +250,6 @@

         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 @@

         return;

     }

+    I_InitWindowTitle();

+    I_InitWindowIcon();

+

     // Blit main screen

     textScreen = TXT_GetScreenData();

     loading = W_CacheLumpName(DEH_String("LOADING"), PU_CACHE);

@@ -1020,6 +1022,8 @@

         gamemode = registered;

         gamedescription = "Heretic (registered)";

     }

+

+    I_SetWindowTitle(gamedescription);

     savegamedir = M_GetSaveGameDir("heretic.wad");

--- 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 @@

         if (I_SetVideoModeHR())

         {

             using_graphical_startup = true;

+            I_InitWindowIcon();

             S_StartSongName("orb", true);