summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2013-10-08 00:34:32 +0000
committerSimon Howard2013-10-08 00:34:32 +0000
commitd4f9e828f61f3c6d02f646f0646e9dbecbb76a49 (patch)
treeae786dfb426a1fb1d1ca7b501b9078ed509cba46
parent6ec6095cb127421fc648781d0820d23d6e7a58a4 (diff)
downloadchocolate-doom-d4f9e828f61f3c6d02f646f0646e9dbecbb76a49.tar.gz
chocolate-doom-d4f9e828f61f3c6d02f646f0646e9dbecbb76a49.tar.bz2
chocolate-doom-d4f9e828f61f3c6d02f646f0646e9dbecbb76a49.zip
Set window title and icon on ENDOOM window to match main game window.
Subversion-branch: /branches/v2-branch Subversion-revision: 2695
-rw-r--r--src/i_endoom.c3
-rw-r--r--src/i_video.c8
-rw-r--r--src/i_video.h3
3 files changed, 9 insertions, 5 deletions
diff --git a/src/i_endoom.c b/src/i_endoom.c
index f3fa1cb2..1381dc42 100644
--- a/src/i_endoom.c
+++ b/src/i_endoom.c
@@ -48,7 +48,8 @@ void I_Endoom(byte *endoom_data)
// Set up text mode screen
TXT_Init();
- TXT_SetWindowTitle(PACKAGE_STRING);
+ I_InitWindowTitle();
+ I_InitWindowIcon();
// Write the data to the screen memory
diff --git a/src/i_video.c b/src/i_video.c
index 99446666..46264fdf 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -1205,7 +1205,7 @@ void I_SetWindowTitle(char *title)
// the title set with I_SetWindowTitle.
//
-static void I_InitWindowTitle(void)
+void I_InitWindowTitle(void)
{
char *buf;
@@ -1220,18 +1220,18 @@ static void I_InitWindowTitle(void)
// Set the application icon
-static void I_InitWindowIcon(void)
+void I_InitWindowIcon(void)
{
SDL_Surface *surface;
Uint8 *mask;
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
diff --git a/src/i_video.h b/src/i_video.h
index 7cc45dc9..ff720922 100644
--- a/src/i_video.h
+++ b/src/i_video.h
@@ -102,6 +102,9 @@ void I_SetGrabMouseCallback(grabmouse_callback_t func);
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).