From 8c2b09d919671c99be96d42bc3aeecec9222b46a Mon Sep 17 00:00:00 2001
From: Cameron Cawley
Date: Wed, 1 May 2019 17:12:18 +0100
Subject: COMMON: Replace NEResourceType and PEResourceType with a shared enum

---
 devtools/create_titanic/winexe.h    | 25 +++++++++++++++++++++++++
 devtools/create_titanic/winexe_pe.h | 23 -----------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

(limited to 'devtools/create_titanic')

diff --git a/devtools/create_titanic/winexe.h b/devtools/create_titanic/winexe.h
index da99c769be..102f1494fd 100644
--- a/devtools/create_titanic/winexe.h
+++ b/devtools/create_titanic/winexe.h
@@ -28,6 +28,31 @@
 
 namespace Common {
 
+/** The default Windows resources. */
+enum WinResourceType {
+	kWinCursor       = 0x01,
+	kWinBitmap       = 0x02,
+	kWinIcon         = 0x03,
+	kWinMenu         = 0x04,
+	kWinDialog       = 0x05,
+	kWinString       = 0x06,
+	kWinFontDir      = 0x07,
+	kWinFont         = 0x08,
+	kWinAccelerator  = 0x09,
+	kWinRCData       = 0x0A,
+	kWinMessageTable = 0x0B,
+	kWinGroupCursor  = 0x0C,
+	kWinGroupIcon    = 0x0E,
+	kWinVersion      = 0x10,
+	kWinDlgInclude   = 0x11,
+	kWinPlugPlay     = 0x13,
+	kWinVXD          = 0x14,
+	kWinAniCursor    = 0x15,
+	kWinAniIcon      = 0x16,
+	kWinHTML         = 0x17,
+	kWinManifest     = 0x18
+};
+
 class WinResourceID {
 public:
 	WinResourceID() { _idType = kIDTypeNull; }
diff --git a/devtools/create_titanic/winexe_pe.h b/devtools/create_titanic/winexe_pe.h
index 3a065c9258..3c960053b2 100644
--- a/devtools/create_titanic/winexe_pe.h
+++ b/devtools/create_titanic/winexe_pe.h
@@ -34,29 +34,6 @@ namespace Common {
 template<class T> class Array;
 class SeekableReadStream;
 
-/** The default Windows PE resources. */
-enum PEResourceType {
-	kPECursor =       0x01,
-	kPEBitmap =       0x02,
-	kPEIcon =         0x03,
-	kPEMenu =         0x04,
-	kPEDialog =       0x05,
-	kPEString =       0x06,
-	kPEFontDir =      0x07,
-	kPEFont =         0x08,
-	kPEAccelerator =  0x09,
-	kPERCData =       0x0A,
-	kPEMessageTable = 0x0B,
-	kPEGroupCursor =  0x0C,
-	kPEGroupIcon =    0x0E,
-	kPEVersion =      0x10,
-	kPEDlgInclude =   0x11,
-	kPEPlugPlay =     0x13,
-	kPEVXD =          0x14,
-	kPEAniCursor =    0x15,
-	kPEAniIcon =      0x16
-};
-
 /**
  * A class able to load resources from a Windows Portable Executable, such
  * as cursors, bitmaps, and sounds.
-- 
cgit v1.2.3