reduce pollution in precompiled header

This commit is contained in:
Silent 2017-03-02 21:59:06 +01:00
parent 91070f80d0
commit 80cc6f07bc
2 changed files with 13 additions and 21 deletions

View file

@ -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);

View file

@ -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