shithub: choc

Info  •  Files  •  Log  •  Branches

Set window title and icon on ENDOOM window to match main game window.

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

--- a/src/i_endoom.c

+++ b/src/i_endoom.c

@@ -48,7 +48,8 @@

     // Set up text mode screen

     TXT_Init();

-    TXT_SetWindowTitle(PACKAGE_STRING);

+    I_InitWindowTitle();

+    I_InitWindowIcon();

     // Write the data to the screen memory

--- a/src/i_video.c

+++ b/src/i_video.c

@@ -1205,7 +1205,7 @@

 // the title set with I_SetWindowTitle.

 //

-static void I_InitWindowTitle(void)

+void I_InitWindowTitle(void)

 {

     char *buf;

@@ -1220,7 +1220,7 @@

 // Set the application icon

-static void I_InitWindowIcon(void)

+void I_InitWindowIcon(void)

 {

     SDL_Surface *surface;

     Uint8 *mask;

@@ -1227,11 +1227,11 @@

     int i;

     // Generate the mask

-  

+

     mask = malloc(icon_w * icon_h / 8);

     memset(mask, 0, icon_w * icon_h / 8);

-    for (i=0; i<icon_w * icon_h; ++i) 

+    for (i=0; i<icon_w * icon_h; ++i)

     {

         if (icon_data[i * 3] != 0x00

          || icon_data[i * 3 + 1] != 0x00

--- a/src/i_video.h

+++ b/src/i_video.h

@@ -102,6 +102,9 @@

 void I_DisplayFPSDots(boolean dots_on);

 void I_BindVideoVariables(void);

+void I_InitWindowTitle(void);

+void I_InitWindowIcon(void);

+

 // Called before processing any tics in a frame (just after displaying a frame).

 // Time consuming syncronous operations are performed here (joystick reading).