From 9514602f9130a793bed901954d1dfa064c263755 Mon Sep 17 00:00:00 2001
From: phobos2077 <phobos2077@gmail.com>
Date: Thu, 16 Mar 2017 01:33:11 +0700
Subject: [PATCH] Removed CommonTypes.h, it's redundant because with
 precompiled header, Windows.h defines are available everywhere

---
 sfall/CommonTypes.h                           | 6 ------
 sfall/FalloutEngine/Functions.h               | 1 -
 sfall/FalloutEngine/Variables.h               | 1 -
 sfall/Modules/Scripting/Handlers/Stats.cpp    | 1 -
 sfall/Modules/Scripting/Handlers/Worldmap.cpp | 1 -
 sfall/ddraw.vcxproj                           | 1 -
 sfall/ddraw.vcxproj.filters                   | 5 +++--
 7 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 sfall/CommonTypes.h

diff --git a/sfall/CommonTypes.h b/sfall/CommonTypes.h
deleted file mode 100644
index 7ec46d0b..00000000
--- a/sfall/CommonTypes.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#ifndef DWORD
-	typedef unsigned long DWORD;
-	typedef unsigned char BYTE;
-#endif // !DWORD
diff --git a/sfall/FalloutEngine/Functions.h b/sfall/FalloutEngine/Functions.h
index ae03ebfc..4c014153 100644
--- a/sfall/FalloutEngine/Functions.h
+++ b/sfall/FalloutEngine/Functions.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "..\CommonTypes.h"
 #include "Structs.h"
 
 // 
diff --git a/sfall/FalloutEngine/Variables.h b/sfall/FalloutEngine/Variables.h
index b0209503..14dd9549 100644
--- a/sfall/FalloutEngine/Variables.h
+++ b/sfall/FalloutEngine/Variables.h
@@ -20,7 +20,6 @@
 
 #include <cassert>
 
-#include "..\CommonTypes.h"
 #include "VariableOffsets.h"
 #include "Structs.h"
 
diff --git a/sfall/Modules/Scripting/Handlers/Stats.cpp b/sfall/Modules/Scripting/Handlers/Stats.cpp
index ee502476..228e8ecc 100644
--- a/sfall/Modules/Scripting/Handlers/Stats.cpp
+++ b/sfall/Modules/Scripting/Handlers/Stats.cpp
@@ -16,7 +16,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "..\..\..\CommonTypes.h"
 #include "..\..\..\FalloutEngine\Fallout2.h"
 #include "..\..\Criticals.h"
 #include "..\..\Knockback.h"
diff --git a/sfall/Modules/Scripting/Handlers/Worldmap.cpp b/sfall/Modules/Scripting/Handlers/Worldmap.cpp
index de86d47b..9e9af816 100644
--- a/sfall/Modules/Scripting/Handlers/Worldmap.cpp
+++ b/sfall/Modules/Scripting/Handlers/Worldmap.cpp
@@ -16,7 +16,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "..\..\..\CommonTypes.h"
 #include "..\..\..\FalloutEngine\Fallout2.h"
 #include "..\..\..\SafeWrite.h"
 #include "..\..\LoadGameHook.h"
diff --git a/sfall/ddraw.vcxproj b/sfall/ddraw.vcxproj
index 795bac5e..01ab734d 100644
--- a/sfall/ddraw.vcxproj
+++ b/sfall/ddraw.vcxproj
@@ -240,7 +240,6 @@
     <ClInclude Include="Modules\Console.h" />
     <ClInclude Include="Modules\Scripting\Handlers\Anims.h" />
     <ClInclude Include="Modules\Scripting\Arrays.h" />
-    <ClInclude Include="CommonTypes.h" />
     <ClInclude Include="Modules\Scripting\Handlers\Core.h" />
     <ClInclude Include="Modules\Scripting\Handlers\FileSystem.h" />
     <ClInclude Include="Modules\Scripting\Handlers\Graphics.h" />
diff --git a/sfall/ddraw.vcxproj.filters b/sfall/ddraw.vcxproj.filters
index a2c88c7c..c601135f 100644
--- a/sfall/ddraw.vcxproj.filters
+++ b/sfall/ddraw.vcxproj.filters
@@ -180,7 +180,6 @@
     <ClInclude Include="Modules\Scripting\Handlers\Worldmap.h">
       <Filter>Modules\Scripting\Handlers</Filter>
     </ClInclude>
-    <ClInclude Include="CommonTypes.h" />
     <ClInclude Include="Modules\Scripting\OpcodeContext.h">
       <Filter>Modules\Scripting</Filter>
     </ClInclude>
@@ -242,11 +241,13 @@
     <ClInclude Include="FalloutEngine\FunctionOffsets_def.h">
       <Filter>FalloutEngine</Filter>
     </ClInclude>
-    <ClInclude Include="FalloutEngine\VariableOffsets.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="Modules\MainLoopHook.h">
       <Filter>Modules</Filter>
     </ClInclude>
+    <ClInclude Include="FalloutEngine\VariableOffsets.h">
+      <Filter>FalloutEngine</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />