From 80cc6f07bcc5dc10b10471a4358d4fd36b100049 Mon Sep 17 00:00:00 2001
From: Silent <zdanio95@gmail.com>
Date: Thu, 2 Mar 2017 21:59:06 +0100
Subject: [PATCH] reduce pollution in precompiled header

---
 SilentPatchSA/SilentPatchSA.cpp | 13 +++++++++++++
 SilentPatchSA/StdAfxSA.h        | 21 ---------------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/SilentPatchSA/SilentPatchSA.cpp b/SilentPatchSA/SilentPatchSA.cpp
index eb01ec6..c1eea60 100644
--- a/SilentPatchSA/SilentPatchSA.cpp
+++ b/SilentPatchSA/SilentPatchSA.cpp
@@ -1,6 +1,9 @@
 #include "StdAfxSA.h"
 #include <limits>
 #include <algorithm>
+#include <d3d9.h>
+#include <Shlwapi.h>
+#include <ShlObj.h>
 
 #include "ScriptSA.h"
 #include "GeneralSA.h"
@@ -184,6 +187,16 @@ RwMatrix* RpHAnimHierarchyGetMatrixArray(RpHAnimHierarchy* hierarchy)
 	return hierarchy->pMatrixArray;
 }
 
+struct AlphaObjectInfo
+{
+	RpAtomic*	pAtomic;
+	RpAtomic*	(*callback)(RpAtomic*, float);
+	float		fCompareValue;
+
+	friend bool operator < (const AlphaObjectInfo &a, const AlphaObjectInfo &b)
+	{ return a.fCompareValue < b.fCompareValue; }
+};
+
 // Other wrappers
 void					(*GTAdelete)(void*) = AddressByVersion<void(*)(void*)>(0x82413F, 0x824EFF, 0x85E58C);
 const char*				(*GetFrameNodeName)(RwFrame*) = AddressByVersion<const char*(*)(RwFrame*)>(0x72FB30, 0x730360, 0x769C20);
diff --git a/SilentPatchSA/StdAfxSA.h b/SilentPatchSA/StdAfxSA.h
index 55ebed7..6d9f483 100644
--- a/SilentPatchSA/StdAfxSA.h
+++ b/SilentPatchSA/StdAfxSA.h
@@ -13,36 +13,19 @@
 #define _WIN32_WINNT 0x0502
 
 #include <windows.h>
-#include <utility> 
 #include <cassert>
-#include <tuple>
-#include <Shlwapi.h>
-#include <ShlObj.h>
 
 #define RwEngineInstance (*rwengine)
 
 #include <rwcore.h>
-#include <rpworld.h>
 #include <rphanim.h>
 #include <rtpng.h>
 
-#include <d3d9.h>
-
 #include "resource.h"
 
 #include "MemoryMgr.h"
 #include "Maths.h"
 
-struct AlphaObjectInfo
-{
-	RpAtomic*	pAtomic;
-	RpAtomic*	(*callback)(RpAtomic*, float);
-	float		fCompareValue;
-
-	friend bool operator < (const AlphaObjectInfo &a, const AlphaObjectInfo &b) 
-	{ return a.fCompareValue < b.fCompareValue; }
-};
-
 // SA operator delete
 extern void	(*GTAdelete)(void* data);
 extern const char* (*GetFrameNodeName)(RwFrame*);
@@ -52,7 +35,3 @@ extern unsigned char& nGameClockDays;
 extern unsigned char& nGameClockMonths;
 
 #define DISABLE_FLA_DONATION_WINDOW		0
-
-//#define HIDE_MATERIAL
-//#define EXPAND_ALPHA_ENTITY_LISTS		800
-//#define EXPAND_BOAT_ALPHA_ATOMIC_LISTS	400
\ No newline at end of file