From 1cececd6e1af4b2dc9cd36f115641297a53c7524 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Thu, 20 May 2004 23:06:24 +0000
Subject: [PATCH] set win32 icon to icon from resource file

---
 ChangeLog         | 2 ++
 arch/win32/init.c | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cfbd6bd6..19aafcec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-05-20  Matthew Mueller  <donut@dakotacom.net>
 
+	* arch/win32/init.c: set win32 icon to icon from resource file
+
 	* arch/win32/key.c: win32: fixed space key not working in messages
 	(d1x r1.2)
 
diff --git a/arch/win32/init.c b/arch/win32/init.c
index 7d06b1b2..fd53bebd 100644
--- a/arch/win32/init.c
+++ b/arch/win32/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.2 2004-05-19 02:39:21 btb Exp $ */
+/* $Id: init.c,v 1.3 2004-05-20 23:06:24 btb Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,6 +6,7 @@
 #include <ddraw.h>
 #include <mmsystem.h>
 #include "args.h"
+#include "resource.h"
 
 #ifndef NDEBUG
 #ifdef _MSC_VER
@@ -132,7 +133,8 @@ void arch_init()
 	wcDescentClass.hInstance     = hInst;
 	wcDescentClass.lpfnWndProc   = DescentWndProc;
 	wcDescentClass.hCursor       = LoadCursor(NULL, IDC_ARROW);
-	wcDescentClass.hIcon         = LoadIcon(NULL, IDI_WINLOGO);
+	//wcDescentClass.hIcon         = LoadIcon(NULL, IDI_WINLOGO);
+	wcDescentClass.hIcon         = LoadIcon(hInst, MAKEINTRESOURCE(IDI_MAIN_ICON));
 	wcDescentClass.lpszMenuName  = NULL;
 	wcDescentClass.hbrBackground = NULL;
 	wcDescentClass.style         = CS_HREDRAW | CS_VREDRAW;
-- 
2.39.2