Merge branch 'master' into master

2026-03-02 12:49:45 +10:00
parent d11b2f396a 0b1a1bfdd4
commit df37fc63a8
36 changed files with 3665 additions and 3747 deletions
@@ -29,6 +29,4 @@ You will need to add every file into their respective project and add the ``extr

 ## What is implemented?

-So far, 4J_Input, 4J_Storage and 4J_Profile can link against the main project just fine, 4J_Render is still not completely decompiled and matched meaning that this is the only piece missing
-
-The only platform currently supported is ``Windows64``, all others need to still be implemented
+All projects can be linked against the main game code, whilst there's some unnamed stuff in the Renderer, this works just fine and the game can be played
@@ -0,0 +1,13 @@
+# Format Style Options - Created with Clang Power Tools
+---
+AccessModifierOffset: -4
+AlignConsecutiveMacros: true
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortEnumsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: Yes
+ColumnLimit: 150
+EmptyLineBeforeAccessModifier: Never
+IndentAccessModifiers: false
+IndentWidth: 4
+NamespaceIndentation: All
+BreakBeforeBraces: Allman
@@ -1,153 +1,153 @@
 #include "4J_Input.h"
-#include "INP_Main.h"
 #include "INP_Keyboard.h"
+#include "INP_Main.h"

 C_4JInput InputManager;
 CKeyboard InternalKeyboard;

 void C_4JInput::Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC)
 {
-	InternalInputManager.Initialise(iInputStateC, ucMapC, ucActionC, ucMenuActionC);
+    InternalInputManager.Initialise(iInputStateC, ucMapC, ucActionC, ucMenuActionC);
 }

 void C_4JInput::Tick(void)
 {
-	InternalInputManager.Tick();
+    InternalInputManager.Tick();
 }

 void C_4JInput::SetDeadzoneAndMovementRange(unsigned int uiDeadzone, unsigned int uiMovementRangeMax)
 {
-	InternalInputManager.SetDeadzoneAndMovementRange(uiDeadzone, uiMovementRangeMax);
+    InternalInputManager.SetDeadzoneAndMovementRange(uiDeadzone, uiMovementRangeMax);
 }

 void C_4JInput::SetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction, unsigned int uiActionVal)
 {
-	InternalInputManager.SetGameJoypadMaps(ucMap, ucAction, uiActionVal);
+    InternalInputManager.SetGameJoypadMaps(ucMap, ucAction, uiActionVal);
 }

 unsigned int C_4JInput::GetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction)
 {
-	return InternalInputManager.GetGameJoypadMaps(ucMap, ucAction);
+    return InternalInputManager.GetGameJoypadMaps(ucMap, ucAction);
 }

 void C_4JInput::SetJoypadMapVal(int iPad, unsigned char ucMap)
 {
-	InternalInputManager.SetJoypadMapVal(iPad, ucMap);
+    InternalInputManager.SetJoypadMapVal(iPad, ucMap);
 }

 unsigned char C_4JInput::GetJoypadMapVal(int iPad)
 {
-	return InternalInputManager.GetJoypadMapVal(iPad);
+    return InternalInputManager.GetJoypadMapVal(iPad);
 }

 void C_4JInput::SetJoypadSensitivity(int iPad, float fSensitivity)
 {
-	InternalInputManager.SetJoypadSensitivity(iPad, fSensitivity);
+    InternalInputManager.SetJoypadSensitivity(iPad, fSensitivity);
 }

 unsigned int C_4JInput::GetValue(int iPad, unsigned char ucAction, bool bRepeat)
 {
-	return InternalInputManager.GetValue(iPad, ucAction, bRepeat);
+    return InternalInputManager.GetValue(iPad, ucAction, bRepeat);
 }

 bool C_4JInput::ButtonPressed(int iPad, unsigned char ucAction)
 {
-	return InternalInputManager.ButtonPressed(iPad, ucAction);
+    return InternalInputManager.ButtonPressed(iPad, ucAction);
 }

 bool C_4JInput::ButtonReleased(int iPad, unsigned char ucAction)
 {
-	return InternalInputManager.ButtonReleased(iPad, ucAction);
+    return InternalInputManager.ButtonReleased(iPad, ucAction);
 }

 bool C_4JInput::ButtonDown(int iPad, unsigned char ucAction)
 {
-	return InternalInputManager.ButtonDown(iPad, ucAction);
+    return InternalInputManager.ButtonDown(iPad, ucAction);
 }

 void C_4JInput::SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, unsigned int uiTo)
 {
-	InternalInputManager.SetJoypadStickAxisMap(iPad, uiFrom, uiTo);
+    InternalInputManager.SetJoypadStickAxisMap(iPad, uiFrom, uiTo);
 }

 void C_4JInput::SetJoypadStickTriggerMap(int iPad, unsigned int uiFrom, unsigned int uiTo)
 {
-	InternalInputManager.SetJoypadStickTriggerMap(iPad, uiFrom, uiTo);
+    InternalInputManager.SetJoypadStickTriggerMap(iPad, uiFrom, uiTo);
 }

 void C_4JInput::SetKeyRepeatRate(float fRepeatDelaySecs, float fRepeatRateSecs)
 {
-	InternalInputManager.SetKeyRepeatRate(fRepeatDelaySecs, fRepeatRateSecs);
+    InternalInputManager.SetKeyRepeatRate(fRepeatDelaySecs, fRepeatRateSecs);
 }

-void C_4JInput::SetDebugSequence(const char* chSequenceA, int(*Func)(LPVOID), LPVOID lpParam)
+void C_4JInput::SetDebugSequence(const char *chSequenceA, int (*Func)(LPVOID), LPVOID lpParam)
 {
-	InternalInputManager.SetDebugSequence(chSequenceA, Func, lpParam);
+    InternalInputManager.SetDebugSequence(chSequenceA, Func, lpParam);
 }

 FLOAT C_4JInput::GetIdleSeconds(int iPad)
 {
-	return InternalInputManager.GetIdleSeconds(iPad);
+    return InternalInputManager.GetIdleSeconds(iPad);
 }

 bool C_4JInput::IsPadConnected(int iPad)
 {
-	return InternalInputManager.IsPadConnected(iPad);
+    return InternalInputManager.IsPadConnected(iPad);
 }

 float C_4JInput::GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay)
 {
-	return InternalInputManager.GetJoypadStick_LX(iPad, bCheckMenuDisplay);
+    return InternalInputManager.GetJoypadStick_LX(iPad, bCheckMenuDisplay);
 }

 float C_4JInput::GetJoypadStick_LY(int iPad, bool bCheckMenuDisplay)
 {
-	return InternalInputManager.GetJoypadStick_LY(iPad, bCheckMenuDisplay);
+    return InternalInputManager.GetJoypadStick_LY(iPad, bCheckMenuDisplay);
 }

 float C_4JInput::GetJoypadStick_RX(int iPad, bool bCheckMenuDisplay)
 {
-	return InternalInputManager.GetJoypadStick_RX(iPad, bCheckMenuDisplay);
+    return InternalInputManager.GetJoypadStick_RX(iPad, bCheckMenuDisplay);
 }

 float C_4JInput::GetJoypadStick_RY(int iPad, bool bCheckMenuDisplay)
 {
-	return InternalInputManager.GetJoypadStick_RY(iPad, bCheckMenuDisplay);
+    return InternalInputManager.GetJoypadStick_RY(iPad, bCheckMenuDisplay);
 }

 unsigned char C_4JInput::GetJoypadLTrigger(int iPad, bool bCheckMenuDisplay)
 {
-	return InternalInputManager.GetJoypadLTrigger(iPad, bCheckMenuDisplay);
+    return InternalInputManager.GetJoypadLTrigger(iPad, bCheckMenuDisplay);
 }

 unsigned char C_4JInput::GetJoypadRTrigger(int iPad, bool bCheckMenuDisplay)
 {
-	return InternalInputManager.GetJoypadRTrigger(iPad, bCheckMenuDisplay);
+    return InternalInputManager.GetJoypadRTrigger(iPad, bCheckMenuDisplay);
 }

 void C_4JInput::SetMenuDisplayed(int iPad, bool bVal)
 {
-	InternalInputManager.SetMenuDisplayed(iPad, bVal);
+    InternalInputManager.SetMenuDisplayed(iPad, bVal);
 }

-EKeyboardResult C_4JInput::RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int(*Func)(LPVOID, const bool), LPVOID lpParam, C_4JInput::EKeyboardMode eMode)
+EKeyboardResult C_4JInput::RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int (*Func)(LPVOID, const bool), LPVOID lpParam,
+                                           C_4JInput::EKeyboardMode eMode)
 {
-	return InternalKeyboard.RequestKeyboard(Title, Text, dwPad, uiMaxChars, Func, lpParam, eMode);
+    return InternalKeyboard.RequestKeyboard(Title, Text, dwPad, uiMaxChars, Func, lpParam, eMode);
 }

-void C_4JInput::GetText(uint16_t* UTF16String)
+void C_4JInput::GetText(uint16_t *UTF16String)
 {
-	InternalKeyboard.GetText(UTF16String);
+    InternalKeyboard.GetText(UTF16String);
 }

-
-bool C_4JInput::VerifyStrings(WCHAR** pwStringA, int iStringC, int(*Func)(LPVOID, STRING_VERIFY_RESPONSE*), LPVOID lpParam)
+bool C_4JInput::VerifyStrings(WCHAR **pwStringA, int iStringC, int (*Func)(LPVOID, STRING_VERIFY_RESPONSE *), LPVOID lpParam)
 {
-	return true;
+    return true;
 }

-void C_4JInput::CancelQueuedVerifyStrings(int(*Func)(LPVOID, STRING_VERIFY_RESPONSE*), LPVOID lpParam) {}
+void C_4JInput::CancelQueuedVerifyStrings(int (*Func)(LPVOID, STRING_VERIFY_RESPONSE *), LPVOID lpParam) {}

 void C_4JInput::CancelAllVerifyInProgress(void) {}

-//bool C_4JInput::InputDetected(DWORD dwUserIndex,WCHAR *pwchInput) {}
+// bool C_4JInput::InputDetected(DWORD dwUserIndex,WCHAR *pwchInput) {}
@@ -2,7 +2,7 @@

 void CForceFeedback::Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC)
 {
-	m_Effects = new FF_EFFECT[MAX_EFFECTS];
+    m_Effects = new FF_EFFECT[MAX_EFFECTS];
    m_EffectC = 0;

    LARGE_INTEGER qwTicksPerSec;
@@ -12,16 +12,13 @@ void CForceFeedback::Initialise(int iInputStateC, unsigned char ucMapC, unsigned
    m_unkBool = 0;
 }

-void CForceFeedback::RumbleEnable(int iQuadrant, bool bRumbleEnabled)
-{
-
-}
+void CForceFeedback::RumbleEnable(int iQuadrant, bool bRumbleEnabled) {}

 void CForceFeedback::CreateEffect(void)
 {
-    assert(m_EffectC<MAX_EFFECTS);
+    assert(m_EffectC < MAX_EFFECTS);

-    FF_EFFECT* pEffect = &m_Effects[m_EffectC];
+    FF_EFFECT *pEffect = &m_Effects[m_EffectC];
    pEffect->m_uiDurationMs = 5;
    pEffect->m_uiMagnitude = 500;
    pEffect->m_uiEffectType = 0;
@@ -33,18 +30,18 @@ void CForceFeedback::CreateEffect(void)

 void CForceFeedback::AddEffectInstance(unsigned int uiEffect)
 {
-    FF_EFFECT_INSTANCE* pEffectInst = new FF_EFFECT_INSTANCE();
-	pEffectInst->m_Effect = &m_Effects[uiEffect];
+    FF_EFFECT_INSTANCE *pEffectInst = new FF_EFFECT_INSTANCE();
+    pEffectInst->m_Effect = &m_Effects[uiEffect];
    pEffectInst->m_uiInst = 0;

-	m_EffectList.AddToTail(pEffectInst);
+    m_EffectList.AddToTail(pEffectInst);
 }

 void CForceFeedback::SetEffectInstanceState(unsigned int uiEffectInstance, unsigned int uiState)
 {
    int iCount = 0;
-    LinkedList::_LL_NODE* pNode;
-    for (pNode = m_EffectList.m_Head; ; pNode = pNode->m_Next)
+    LinkedList::_LL_NODE *pNode;
+    for (pNode = m_EffectList.m_Head;; pNode = pNode->m_Next)
    {
        if ((iCount++) == uiEffectInstance)
            break;
@@ -52,34 +49,28 @@ void CForceFeedback::SetEffectInstanceState(unsigned int uiEffectInstance, unsig
    pNode->GetDataAs<FF_EFFECT_INSTANCE>()->m_bIsActive = true;
 }

-void CForceFeedback::ProcessEventInstance(FF_EFFECT_INSTANCE* pEffectInst)
-{
+void CForceFeedback::ProcessEventInstance(FF_EFFECT_INSTANCE *pEffectInst) {}

-}
-
-void CForceFeedback::PauseEventInstance(FF_EFFECT_INSTANCE* pEffectInst)
-{
-
-}
+void CForceFeedback::PauseEventInstance(FF_EFFECT_INSTANCE *pEffectInst) {}

 void CForceFeedback::AddRumble(unsigned int uiPad, WORD leftMotorSpeed, WORD rightMotorSpeed, float fSeconds)
 {
-	RUMBLE_EFFECT* pRumble = new RUMBLE_EFFECT();
+    RUMBLE_EFFECT *pRumble = new RUMBLE_EFFECT();

-	LARGE_INTEGER qwCurrentTime;
-	QueryPerformanceCounter(&qwCurrentTime);
+    LARGE_INTEGER qwCurrentTime;
+    QueryPerformanceCounter(&qwCurrentTime);

-	pRumble->m_TimeLeft = (m_TicksPerSecond * fSeconds) + qwCurrentTime.QuadPart;
-	pRumble->m_RumbleData.wLeftMotorSpeed = leftMotorSpeed;
-	pRumble->m_RumbleData.wRightMotorSpeed = rightMotorSpeed;
-	pRumble->m_Pad = uiPad;
+    pRumble->m_TimeLeft = (m_TicksPerSecond * fSeconds) + qwCurrentTime.QuadPart;
+    pRumble->m_RumbleData.wLeftMotorSpeed = leftMotorSpeed;
+    pRumble->m_RumbleData.wRightMotorSpeed = rightMotorSpeed;
+    pRumble->m_Pad = uiPad;

-	m_RumbleList.AddToTail(pRumble);
+    m_RumbleList.AddToTail(pRumble);
 }

 void CForceFeedback::Tick(void)
 {
-    for (LinkedList::_LL_NODE* pEffectNode = m_EffectList.m_Head; pEffectNode; pEffectNode = pEffectNode->m_Next)
+    for (LinkedList::_LL_NODE *pEffectNode = m_EffectList.m_Head; pEffectNode; pEffectNode = pEffectNode->m_Next)
    {
        if (pEffectNode->GetDataAs<FF_EFFECT_INSTANCE>()->m_bIsActive)
        {
@@ -90,21 +81,21 @@ void CForceFeedback::Tick(void)
    LARGE_INTEGER qwCurrentTime;
    QueryPerformanceCounter(&qwCurrentTime);

-    LinkedList::_LL_NODE* pRumbleNode = m_RumbleList.m_Head;
+    LinkedList::_LL_NODE *pRumbleNode = m_RumbleList.m_Head;
    while (pRumbleNode)
    {
        if (pRumbleNode->GetDataAs<RUMBLE_EFFECT>()->m_TimeLeft <= qwCurrentTime.QuadPart)
        {
-            RUMBLE_EFFECT* pRumble = pRumbleNode->GetDataAs<RUMBLE_EFFECT>();
+            RUMBLE_EFFECT *pRumble = pRumbleNode->GetDataAs<RUMBLE_EFFECT>();

            pRumble->m_RumbleData.wLeftMotorSpeed = 0;
            pRumble->m_RumbleData.wRightMotorSpeed = 0;

            XInputSetState(pRumble->m_Pad, &pRumble->m_RumbleData);

-			m_RumbleList.RemoveNode(pRumbleNode);
+            m_RumbleList.RemoveNode(pRumbleNode);

-            LinkedList::_LL_NODE* pTemp = pRumbleNode;
+            LinkedList::_LL_NODE *pTemp = pRumbleNode;
            pRumbleNode = pRumbleNode->m_Next;

            delete pTemp->m_pvData;
@@ -6,56 +6,55 @@
 class CForceFeedback
 {
 public:
+    enum FF_PARAMS
+    {
+        FF_PARAMS_RAMP,
+        FF_PARAMS_PERIODIC
+    };

-	enum FF_PARAMS
-	{
-		FF_PARAMS_RAMP,
-		FF_PARAMS_PERIODIC
-	};
+    struct RUMBLE_EFFECT
+    {
+        DWORD m_Pad;
+        uint64_t m_TimeLeft;
+        XINPUT_VIBRATION m_RumbleData;
+        WORD unk;
+    };

-	struct RUMBLE_EFFECT
-	{
-		DWORD m_Pad;
-		uint64_t m_TimeLeft;
-		XINPUT_VIBRATION m_RumbleData;
-		WORD unk;
-	};
+    struct FF_EFFECT
+    {
+        unsigned int m_uiEffectType;
+        unsigned int m_uiDurationMs;
+        BYTE gap8[4];
+        unsigned int m_uiMagnitude;
+        BYTE gap10[8];
+        DWORD dword18;
+        DWORD dword1C;
+    };

-	struct FF_EFFECT
-	{
-		unsigned int m_uiEffectType;
-		unsigned int m_uiDurationMs;
-		BYTE gap8[4];
-		unsigned int m_uiMagnitude;
-		BYTE gap10[8];
-		DWORD dword18;
-		DWORD dword1C;
-	};
+    struct FF_EFFECT_INSTANCE
+    {
+        bool m_bIsActive;
+        unsigned int m_uiInst;
+        CForceFeedback::FF_EFFECT *m_Effect;
+    };

-	struct FF_EFFECT_INSTANCE
-	{
-		bool m_bIsActive;
-		unsigned int m_uiInst;
-		CForceFeedback::FF_EFFECT* m_Effect;
-	};
+    void Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC);
+    void RumbleEnable(int iQuadrant, bool bRumbleEnabled);
+    void CreateEffect(void);
+    void AddEffectInstance(unsigned int uiEffect);
+    void SetEffectInstanceState(unsigned int uiEffectInstance, unsigned int uiState);

-	void				Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC);
-	void				RumbleEnable(int iQuadrant, bool bRumbleEnabled);
-	void				CreateEffect(void);
-	void				AddEffectInstance(unsigned int uiEffect);
-	void				SetEffectInstanceState(unsigned int uiEffectInstance, unsigned int uiState);
+    void ProcessEventInstance(FF_EFFECT_INSTANCE *pEffectInst);
+    void PauseEventInstance(FF_EFFECT_INSTANCE *pEffectInst);

-	void				ProcessEventInstance(FF_EFFECT_INSTANCE* pEffectInst);
-	void				PauseEventInstance(FF_EFFECT_INSTANCE* pEffectInst);
+    void AddRumble(unsigned int uiPad, WORD leftMotorSpeed, WORD rightMotorSpeed, float fSeconds);

-	void				AddRumble(unsigned int uiPad, WORD leftMotorSpeed, WORD rightMotorSpeed, float fSeconds);
+    void Tick(void);

-	void				Tick(void);
-
-	LinkedList m_EffectList;
-	FF_EFFECT* m_Effects;
-	int m_EffectC;
-	LinkedList m_RumbleList;
-	float m_TicksPerSecond;
-	bool m_unkBool;
+    LinkedList m_EffectList;
+    FF_EFFECT *m_Effects;
+    int m_EffectC;
+    LinkedList m_RumbleList;
+    float m_TicksPerSecond;
+    bool m_unkBool;
 };
@@ -1,24 +1,22 @@
 #include "INP_Keyboard.h"

-void CKeyboard::Tick(void)
-{
+void CKeyboard::Tick(void) {}

+EKeyboardResult CKeyboard::RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int (*Func)(LPVOID, const bool), LPVOID lpParam,
+                                           C_4JInput::EKeyboardMode eMode)
+{
+    ClearGlobalText();
+    SeedEditBox();
+    Func(lpParam, C_4JInput::EKeyboardMode_Numeric);
+
+    return EKeyboard_ResultAccept;
 }

-EKeyboardResult	CKeyboard::RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int(*Func)(LPVOID, const bool), LPVOID lpParam, C_4JInput::EKeyboardMode eMode)
-{ 
-	ClearGlobalText();
-	SeedEditBox();
-	Func(lpParam, C_4JInput::EKeyboardMode_Numeric);
-
-	return EKeyboard_ResultAccept;
-}
-
-void CKeyboard::GetText(uint16_t* UTF16String)
+void CKeyboard::GetText(uint16_t *UTF16String)
 {
-	uint16_t* keyString = GetGlobalText();
-	for (unsigned int index = 0; keyString[index] && index < 0x200; index++)
-	{
-		UTF16String[index] = keyString[index];
-	}
+    uint16_t *keyString = GetGlobalText();
+    for (unsigned int index = 0; keyString[index] && index < 0x200; index++)
+    {
+        UTF16String[index] = keyString[index];
+    }
 }
@@ -2,28 +2,25 @@
 #include "4J_Input.h"

 void ClearGlobalText();
-uint16_t* GetGlobalText();
+uint16_t *GetGlobalText();
 void SeedEditBox();

 class CKeyboard
 {
 public:
+    enum EKeyboardProcessState
+    {
+    };

-	enum EKeyboardProcessState
-	{
+    struct SKeyboardInfo
+    {
+    };

-	};
+    void Tick(void);

-	struct SKeyboardInfo
-	{
+    EKeyboardResult RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int (*Func)(LPVOID, const bool), LPVOID lpParam,
+                                    C_4JInput::EKeyboardMode eMode);
+    void GetText(uint16_t *UTF16String);

-	};
-
-	void				Tick(void);
-
-	EKeyboardResult		RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int(*Func)(LPVOID, const bool), LPVOID lpParam, C_4JInput::EKeyboardMode eMode);
-	void GetText(uint16_t* UTF16String);
-
-
-	BYTE gap0[0x68];
+    BYTE gap0[0x68];
 };
@@ -7,155 +7,152 @@
 class CInput
 {
 public:
+    struct JOYPAD
+    {
+        bool m_bIsDisabled;
+        bool m_bIsConnected;
+        bool m_bWasConnected;
+        bool m_bHasConnected;

+        unsigned int m_uiButtons;
+        unsigned int m_uiOldButtons;
+        int m_uiButtonsPressed;
+        int m_uiButtonsReleased;

-	struct JOYPAD
-	{
-		bool m_bIsDisabled;
-		bool m_bIsConnected;
-		bool m_bWasConnected;
-		bool m_bHasConnected;
+        int m_iRightThumbX;
+        int m_iRightThumbY;
+        int m_iLeftThumbX;
+        int m_iLeftThumbY;

-		unsigned int m_uiButtons;
-		unsigned int m_uiOldButtons;
-		int m_uiButtonsPressed;
-		int m_uiButtonsReleased;
+        DWORD m_iNormalizedRightThumbX;
+        DWORD m_iNormalizedRightThumbY;
+        DWORD m_iNormalizedLeftThumbX;
+        DWORD m_iNormalizedLeftThumbY;

-		int m_iRightThumbX;
-		int m_iRightThumbY;
-		int m_iLeftThumbX;
-		int m_iLeftThumbY;
+        float m_fNormalizedRightThumbX;
+        float m_fNormalizedRightThumbY;
+        float m_fNormalizedLeftThumbX;
+        float m_fNormalizedLeftThumbY;

-		DWORD m_iNormalizedRightThumbX;
-		DWORD m_iNormalizedRightThumbY;
-		DWORD m_iNormalizedLeftThumbX;
-		DWORD m_iNormalizedLeftThumbY;
+        unsigned char m_ucLeftTriggerState;
+        unsigned char m_ucRightTriggerState;

-		float m_fNormalizedRightThumbX;
-		float m_fNormalizedRightThumbY;
-		float m_fNormalizedLeftThumbX;
-		float m_fNormalizedLeftThumbY;
+        float *m_pfLeftThumbXAxisMap;
+        float *m_pfLeftThumbYAxisMap;
+        float *m_pfRightThumbXAxisMap;
+        float *m_pfRightThumbYAxisMap;

-		unsigned char m_ucLeftTriggerState;
-		unsigned char m_ucRightTriggerState;
+        float m_fSensitivity;

-		float* m_pfLeftThumbXAxisMap;
-		float* m_pfLeftThumbYAxisMap;
-		float* m_pfRightThumbXAxisMap;
-		float* m_pfRightThumbYAxisMap;
+        BYTE *m_pucLeftTriggerAxisMap;
+        BYTE *m_pucRightTriggerAxisMap;

-		float m_fSensitivity;
+        unsigned char m_ucMappingValue;
+        unsigned char m_ucInputStateIndex;
+        XINPUT_STATE *m_pInputStates;
+    };

-		BYTE* m_pucLeftTriggerAxisMap;
-		BYTE* m_pucRightTriggerAxisMap;
+    struct JOYPADS
+    {
+    };

-		unsigned char m_ucMappingValue;
-		unsigned char m_ucInputStateIndex;
-		XINPUT_STATE* m_pInputStates;
-	};
+    struct TimeInfo
+    {
+        LARGE_INTEGER m_qwStartTime;
+        LARGE_INTEGER m_qwTotalHoldTicks;
+        float m_fTotalHoldTime;
+        float m_fLastRepeatTime;
+        bool m_bInitialPressHandled;
+    };

-	struct JOYPADS
-	{
+    CInput();

-	};
+    void Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC);
+    void Tick(void);

-	struct TimeInfo
-	{
-		LARGE_INTEGER m_qwStartTime;
-		LARGE_INTEGER m_qwTotalHoldTicks;
-		float m_fTotalHoldTime;
-		float m_fLastRepeatTime;
-		bool m_bInitialPressHandled;
-	};
+    void SetJoypadValues(JOYPAD *pThisPad);
+    void SetDeadzoneAndMovementRange(unsigned int uiDeadzone, unsigned int uiMovementRangeMax);
+    void SetJoypadSensitivity(int iPad, float fSensitivity);

-	CInput();
+    void SetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction, unsigned int uiActionVal);
+    unsigned int GetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction);
+    void SetJoypadMapVal(int iPad, unsigned char ucMap);
+    unsigned char GetJoypadMapVal(int iPad);

-	void				Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC);
-	void				Tick(void);
+    void SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, unsigned int uiTo);
+    void SetJoypadStickTriggerMap(int iPad, unsigned int uiFrom, unsigned int uiTo);

-	void				SetJoypadValues(JOYPAD* pThisPad);
-	void				SetDeadzoneAndMovementRange(unsigned int uiDeadzone, unsigned int uiMovementRangeMax);
-	void				SetJoypadSensitivity(int iPad, float fSensitivity);
+    bool IsPadConnected(int iPad);
+    void SetSigninJoypadMask(unsigned int mask);
+    unsigned int GetValue(int iPad, unsigned char ucAction, bool bRepeat = false);
+    bool IsSet(int iPad, unsigned char ucAction);

-	void				SetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction, unsigned int uiActionVal);
-	unsigned int		GetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction);
-	void				SetJoypadMapVal(int iPad, unsigned char ucMap);
-	unsigned char		GetJoypadMapVal(int iPad);
+    bool ButtonPressed(int iPad, unsigned char ucAction = 255); // toggled
+    bool ButtonReleased(int iPad, unsigned char ucAction);      // toggled
+    bool ButtonDown(int iPad, unsigned char ucAction = 255);    // button held down

-	void				SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, unsigned int uiTo);
-	void				SetJoypadStickTriggerMap(int iPad, unsigned int uiFrom, unsigned int uiTo);
+    float GetJoypadStick_Menu_LX(unsigned char ucPad);
+    float GetJoypadStick_Menu_LY(unsigned char ucPad);
+    float GetJoypadStick_Menu_RX(unsigned char ucPad);
+    float GetJoypadStick_Menu_RY(unsigned char ucPad);
+    unsigned char GetJoypadLTrigger_Menu(unsigned char ucPad);
+    unsigned char GetJoypadRTrigger_Menu(unsigned char ucPad);

-	bool				IsPadConnected(int iPad);
-	void				SetSigninJoypadMask(unsigned int mask);
-	unsigned int		GetValue(int iPad, unsigned char ucAction, bool bRepeat = false);
-	bool				IsSet(int iPad, unsigned char ucAction);
+    float GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay = true);
+    float GetJoypadStick_LY(int iPad, bool bCheckMenuDisplay = true);
+    float GetJoypadStick_RX(int iPad, bool bCheckMenuDisplay = true);
+    float GetJoypadStick_RY(int iPad, bool bCheckMenuDisplay = true);
+    unsigned char GetJoypadLTrigger(int iPad, bool bCheckMenuDisplay = true);
+    unsigned char GetJoypadRTrigger(int iPad, bool bCheckMenuDisplay = true);

-	bool				ButtonPressed(int iPad, unsigned char ucAction = 255); // toggled
-	bool				ButtonReleased(int iPad, unsigned char ucAction); //toggled
-	bool				ButtonDown(int iPad, unsigned char ucAction = 255); // button held down
+    void SetMenuDisplayed(int iPad, bool bVal);

-	float				GetJoypadStick_Menu_LX(unsigned char ucPad);
-	float				GetJoypadStick_Menu_LY(unsigned char ucPad);
-	float				GetJoypadStick_Menu_RX(unsigned char ucPad);
-	float				GetJoypadStick_Menu_RY(unsigned char ucPad);
-	unsigned char		GetJoypadLTrigger_Menu(unsigned char ucPad);
-	unsigned char		GetJoypadRTrigger_Menu(unsigned char ucPad);
+    void SetKeyRepeatRate(float fRepeatDelaySecs, float fRepeatRateSecs);
+    void SetDebugSequence(const char *chSequenceA, int (*Func)(LPVOID), LPVOID lpParam);
+    FLOAT GetIdleSeconds(int iPad);

-	float				GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay = true);
-	float				GetJoypadStick_LY(int iPad, bool bCheckMenuDisplay = true);
-	float				GetJoypadStick_RX(int iPad, bool bCheckMenuDisplay = true);
-	float				GetJoypadStick_RY(int iPad, bool bCheckMenuDisplay = true);
-	unsigned char		GetJoypadLTrigger(int iPad, bool bCheckMenuDisplay = true);
-	unsigned char		GetJoypadRTrigger(int iPad, bool bCheckMenuDisplay = true);
+    bool UpdateJoypads(void);
+    void ClearJoypadValues(JOYPAD *pThisPad);

-	void				SetMenuDisplayed(int iPad, bool bVal);
+    void InitTime(void);
+    void GetStartTime(int iPad, int iKey);
+    void UpdateTime(int iPad, int iKey);

-	void				SetKeyRepeatRate(float fRepeatDelaySecs, float fRepeatRateSecs);
-	void				SetDebugSequence(const char* chSequenceA, int(*Func)(LPVOID), LPVOID lpParam);
-	FLOAT				GetIdleSeconds(int iPad);
+    BYTE gap0[16];

-	bool				UpdateJoypads(void);
-	void				ClearJoypadValues(JOYPAD* pThisPad);
+    JOYPAD m_Joypads[MAX_JOYPADS];

-	void				InitTime(void);
-	void				GetStartTime(int iPad, int iKey);
-	void				UpdateTime(int iPad, int iKey);
+    int m_iDeadzone;
+    int m_iMovementRangeMax;
+    int m_iEffectiveRange;
+    int m_iHalfRange;
+    float m_fEffectiveRange;

-	BYTE gap0[16];
+    unsigned char m_ucInputStateC;
+    unsigned char m_ucJoypadMapC;
+    unsigned char m_ucJoypadMapActionC;
+    unsigned char m_ucMenuActionC;

-	JOYPAD m_Joypads[MAX_JOYPADS];
+    unsigned int **m_JoypadMap;

-	int m_iDeadzone;
-	int m_iMovementRangeMax;
-	int m_iEffectiveRange;
-	int m_iHalfRange;
-	float m_fEffectiveRange;
+    bool m_bJoypadMapArrayIsSetup;
+    unsigned int m_uiSigninJoypadMask;
+    bool m_bIsMenuDisplayed[MAX_JOYPADS];

-	unsigned char m_ucInputStateC;
-	unsigned char m_ucJoypadMapC;
-	unsigned char m_ucJoypadMapActionC;
-	unsigned char m_ucMenuActionC;
+    CForceFeedback m_ForceFeedback;
+    CKeyboard m_Keyboard;

-	unsigned int** m_JoypadMap;
+    float m_fTickToSeconds;
+    float m_fRepeatDelaySecs;
+    float m_fRepeatRateSecs;

-	bool m_bJoypadMapArrayIsSetup;
-	unsigned int m_uiSigninJoypadMask;
-	bool m_bIsMenuDisplayed[MAX_JOYPADS];
+    TimeInfo m_Timers[MAX_JOYPADS][24];
+    LARGE_INTEGER m_LastActivityTime[MAX_JOYPADS];

-	CForceFeedback m_ForceFeedback;
-	CKeyboard m_Keyboard;
-
-	float m_fTickToSeconds;
-	float m_fRepeatDelaySecs;
-	float m_fRepeatRateSecs;
-
-	TimeInfo m_Timers[MAX_JOYPADS][24];
-	LARGE_INTEGER m_LastActivityTime[MAX_JOYPADS];
-
-	char* m_sDebugSequenceName;
-	unsigned int m_uiDebugSequenceIndex;
-	int (*m_pDebugSequenceFn)(void*);
-	LPVOID m_pDebugSequenceParam;
+    char *m_sDebugSequenceName;
+    unsigned int m_uiDebugSequenceIndex;
+    int (*m_pDebugSequenceFn)(void *);
+    LPVOID m_pDebugSequenceParam;
 };

 // Singleton
@@ -7,9 +7,9 @@ LinkedList::LinkedList()
    this->m_Tail = nullptr;
 }

-void LinkedList::AddToHead(void* pvData)
+void LinkedList::AddToHead(void *pvData)
 {
-    _LL_NODE* pNode = new _LL_NODE();
+    _LL_NODE *pNode = new _LL_NODE();
    pNode->m_pvData = pvData;

    if (!m_Tail)
@@ -27,9 +27,9 @@ void LinkedList::AddToHead(void* pvData)
    m_NodeC++;
 }

-void LinkedList::AddToTail(void* pvData)
+void LinkedList::AddToTail(void *pvData)
 {
-    _LL_NODE* pNode = new _LL_NODE();
+    _LL_NODE *pNode = new _LL_NODE();
    pNode->m_pvData = pvData;

    if (!m_Head)
@@ -37,7 +37,8 @@ void LinkedList::AddToTail(void* pvData)
        m_Head = pNode;
    }

-    if (m_Tail) {
+    if (m_Tail)
+    {
        m_Tail->m_Next = pNode;
        pNode->m_Prev = m_Tail;
    }
@@ -49,9 +50,9 @@ void LinkedList::AddToTail(void* pvData)
    m_NodeC++;
 }

-void LinkedList::RemoveNode(_LL_NODE* pNodeToRemove)
+void LinkedList::RemoveNode(_LL_NODE *pNodeToRemove)
 {
-    _LL_NODE* pCurrentNode;
+    _LL_NODE *pCurrentNode;
    for (pCurrentNode = m_Head; pCurrentNode != pNodeToRemove; pCurrentNode = pCurrentNode->m_Next)
    {
        ;
@@ -61,7 +62,7 @@ void LinkedList::RemoveNode(_LL_NODE* pNodeToRemove)
    {
        m_Head = m_Head->m_Next;
    }
-    else 
+    else
    {
        pCurrentNode->m_Prev->m_Next = pCurrentNode->m_Next;

@@ -74,9 +75,9 @@ void LinkedList::RemoveNode(_LL_NODE* pNodeToRemove)
    m_NodeC--;
 }

-LinkedList::_LL_NODE* LinkedList::RemoveHeadNode() 
+LinkedList::_LL_NODE *LinkedList::RemoveHeadNode()
 {
-    _LL_NODE* pHeadNode = m_Head;
+    _LL_NODE *pHeadNode = m_Head;

    if (m_NodeC > 0)
    {
@@ -87,11 +88,11 @@ LinkedList::_LL_NODE* LinkedList::RemoveHeadNode()
    return pHeadNode;
 }

-void LinkedList::ClearList() 
+void LinkedList::ClearList()
 {
-    while (true) 
+    while (true)
    {
-        _LL_NODE* pHeadNode = RemoveHeadNode();
+        _LL_NODE *pHeadNode = RemoveHeadNode();
        if (!pHeadNode)
        {
            break;
@@ -3,29 +3,27 @@
 class LinkedList
 {
 public:
+    struct _LL_NODE
+    {
+        template <typename T>
+        T *GetDataAs()
+        {
+            return (T *)m_pvData;
+        }

+        void *m_pvData;
+        _LL_NODE *m_Next;
+        _LL_NODE *m_Prev;
+    };

-	struct _LL_NODE
-	{
-		template<typename T>
-		T* GetDataAs()
-		{
-			return (T*)m_pvData;
-		}
+    int m_NodeC;
+    _LL_NODE *m_Head;
+    _LL_NODE *m_Tail;

-		void* m_pvData;
-		_LL_NODE* m_Next;
-		_LL_NODE* m_Prev;
-	};
-
-	int m_NodeC;
-	_LL_NODE* m_Head;
-	_LL_NODE* m_Tail;
-
-	LinkedList();
-	void AddToHead(void* pvData);
-	void AddToTail(void* pvData);
-	void RemoveNode(_LL_NODE* pNodeToRemove);
-	_LL_NODE* RemoveHeadNode();
-	void ClearList();
+    LinkedList();
+    void AddToHead(void *pvData);
+    void AddToTail(void *pvData);
+    void RemoveNode(_LL_NODE *pNodeToRemove);
+    _LL_NODE *RemoveHeadNode();
+    void ClearList();
 };
@@ -2,6 +2,8 @@
 #include "4J_Render.h"
 #include "Renderer.h"

+C4JRender RenderManager;
+
 void C4JRender::Tick()
 {
 #if _DEBUG
@@ -477,5 +479,3 @@ void C4JRender::Resume()
 {
 	InternalRenderManager.Resume();
 }
-
-C4JRender RenderManager;
@@ -22,7 +22,7 @@ void main(

 */

-static unsigned char PS_ForceLOD_Data[] =
+static unsigned char g_main_PS_ForceLOD[] =
 {
  0x44, 0x58, 0x42, 0x43, 0x8A, 0x1E, 0x45, 0x87, 0xE0, 0xB2,
  0xDE, 0x2C, 0x00, 0x06, 0x9B, 0x08, 0x7F, 0x92, 0xEA, 0xE6,
@@ -11,7 +11,7 @@ void main(

 */

-static unsigned char PS_ScreenClear_Data[] =
+static unsigned char g_main_PS_ScreenClear[] =
 {
  0x44, 0x58, 0x42, 0x43, 0xF5, 0xD0, 0x7D, 0x98, 0xF4, 0x78,
  0x62, 0xB1, 0x25, 0x1A, 0x74, 0x57, 0xF0, 0x48, 0x57, 0x90,
@@ -12,7 +12,7 @@ void main(

 */

-static unsigned char PS_ScreenSpace_Data[] =
+static unsigned char g_main_PS_ScreenSpace[] =
 {
  0x44, 0x58, 0x42, 0x43, 0xB8, 0xC0, 0x6E, 0x7D, 0xDE, 0x9F,
  0x85, 0xBA, 0x86, 0xB9, 0x41, 0xAB, 0xCA, 0x09, 0x13, 0x95,
@@ -30,7 +30,7 @@ void main(

 */

-static unsigned char PS_Standard_Data[] =
+static unsigned char g_main_PS_Standard[] =
 {
  0x44, 0x58, 0x42, 0x43, 0x3E, 0xD7, 0x47, 0x3D, 0x43, 0x30,
  0xB0, 0x7E, 0x8F, 0xF4, 0xBD, 0xA7, 0xCA, 0xCF, 0x70, 0x12,
@@ -23,7 +23,7 @@ void main(

 */

-static unsigned char PS_TextureProjection_Data[] =
+static unsigned char g_main_PS_TextureProjection[] =
 {
  0x44, 0x58, 0x42, 0x43, 0x31, 0x2E, 0x38, 0xEB, 0x1E, 0x13,
  0x9F, 0xFA, 0xC3, 0x6B, 0xC2, 0x09, 0xD6, 0xCC, 0xBF, 0x4E,
@@ -4,448 +4,450 @@
 #include <unordered_map>
 #include <vector>

+#define MATRIX_MODE_MODELVIEW            0
+#define MATRIX_MODE_MODELVIEW_PROJECTION 1
+#define MATRIX_MODE_MODELVIEW_TEXTURE    2
+#define MATRIX_MODE_MODELVIEW_CBUFF      3
+#define MATRIX_MODE_MODELVIEW_MAX        4
+
+#define STACK_TYPES    4
+#define STACK_SIZE     16
 #define MAX_MIP_LEVELS 5
 #define MAX_TEXTURES 512

+#define NUM_COMMAND_HANDLES 0x800000
+#define MAX_COMMAND_BUFFERS 16000
+
 class Renderer
 {
 public:
-	struct Context;
-	struct CommandBuffer;
-
-	void Tick();
-	void UpdateGamma(unsigned short usGamma);
-	void MatrixMode(int type);
-	void MatrixSetIdentity();
-	void MatrixTranslate(float x, float y, float z);
-	void MatrixRotate(float angle, float x, float y, float z);
-	void MatrixScale(float x, float y, float z);
-	void MatrixPerspective(float fovy, float aspect, float zNear, float zFar);
-	void MatrixOrthogonal(float left, float right, float bottom, float top, float zNear, float zFar);
-	void MatrixPop();
-	void MatrixPush();
-	void MatrixMult(float* mat);
-	const float* MatrixGet(int type);
-	void Set_matrixDirty();
-	void Initialise(ID3D11Device* pDevice, IDXGISwapChain* pSwapChain);
-	ID3D11DeviceContext* InitialiseContext(bool fromPresent);
-	void StartFrame();
-	void DoScreenGrabOnNextPresent();
-	void Present();
-	void Clear(int flags, D3D11_RECT* pRect);
-	void SetClearColour(const float colourRGBA[4]);
-	bool IsWidescreen();
-	bool IsHiDef();
-	void CaptureThumbnail(ImageFileBuffer* pngOut);
-	void CaptureScreen(ImageFileBuffer* jpgOut, XSOCIAL_PREVIEWIMAGE* previewOut);
-	void BeginConditionalSurvey(int identifier);
-	void EndConditionalSurvey();
-	void BeginConditionalRendering(int identifier);
-	void EndConditionalRendering();
-	void DrawVertices(C4JRender::ePrimitiveType PrimitiveType, int count, void* dataIn, C4JRender::eVertexType vType, C4JRender::ePixelShaderType psType);
-	void DrawVertexBuffer(C4JRender::ePrimitiveType PrimitiveType, int count, ID3D11Buffer* buffer, C4JRender::eVertexType vType, C4JRender::ePixelShaderType psType);
-	void CBuffLockStaticCreations();
-	int CBuffCreate(int count);
-	void CBuffDelete(int first, int count);
-	void CBuffStart(int index, bool full);
-	void CBuffClear(int index);
-	int CBuffSize(int index);
-	void CBuffEnd();
-	bool CBuffCall(int index, bool full);
-	void CBuffTick();
-	void CBuffDeferredModeStart();
-	void CBuffDeferredModeEnd();
-	int TextureCreate();
-	void TextureFree(int idx);
-	void TextureBind(int idx);
-	void TextureBindVertex(int idx);
-	void TextureSetTextureLevels(int levels);
-	int TextureGetTextureLevels();
-	void TextureSetParam(int param, int value);
-	void TextureDynamicUpdateStart();
-	void TextureDynamicUpdateEnd();
-	void TextureData(int width, int height, void* data, int level, C4JRender::eTextureFormat format);
-	void TextureDataUpdate(int xoffset, int yoffset, int width, int height, void* data, int level);
-	HRESULT LoadTextureData(const char* szFilename, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut);
-	HRESULT LoadTextureData(BYTE* pbData, DWORD dwBytes, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut);
-	HRESULT SaveTextureData(const char* szFilename, D3DXIMAGE_INFO* pSrcInfo, int* ppDataOut);
-	HRESULT SaveTextureDataToMemory(void* pOutput, int outputCapacity, int* outputLength, int width, int height, int* ppDataIn);
-	void TextureGetStats();
-	ID3D11ShaderResourceView* TextureGetTexture(int idx);
-	void StateSetColour(float r, float g, float b, float a);
-	void StateSetDepthMask(bool enable);
-	void StateSetBlendEnable(bool enable);
-	void StateSetBlendFunc(int src, int dst);
-	void StateSetBlendFactor(unsigned int colour);
-	void StateSetAlphaFunc(int func, float param);
-	void StateSetDepthFunc(int func);
-	void StateSetFaceCull(bool enable);
-	void StateSetFaceCullCW(bool enable);
-	void StateSetLineWidth(float width);
-	void StateSetWriteEnable(bool red, bool green, bool blue, bool alpha);
-	void StateSetDepthTestEnable(bool enable);
-	void StateSetAlphaTestEnable(bool enable);
-	void StateSetDepthSlopeAndBias(float slope, float bias);
-	void StateSetFogEnable(bool enable);
-	void StateSetFogMode(int mode);
-	void StateSetFogNearDistance(float dist);
-	void StateSetFogFarDistance(float dist);
-	void StateSetFogDensity(float density);
-	void StateSetFogColour(float red, float green, float blue);
-	void StateSetLightingEnable(bool enable);
-	void StateSetVertexTextureUV(float u, float v);
-	void StateSetLightColour(int light, float red, float green, float blue);
-	void StateSetLightAmbientColour(float red, float green, float blue);
-	void StateSetLightDirection(int light, float x, float y, float z);
-	void StateSetLightEnable(int light, bool enable);
-	void StateSetViewport(C4JRender::eViewportType viewportType);
-	void StateSetEnableViewportClipPlanes(bool enable);
-	void StateSetTexGenCol(int col, float x, float y, float z, float w, bool eyeSpace);
-	void StateSetStencil(D3D11_COMPARISON_FUNC function, uint8_t stencil_ref, uint8_t stencil_func_mask, uint8_t stencil_write_mask);
-	void StateSetForceLOD(int LOD);
-	void BeginEvent(LPCWSTR eventName);
-	void EndEvent();
-	void Suspend();
-	bool Suspended();
-	void Resume();
-	void StateUpdate();
+    struct Context;
+    struct CommandBuffer;

+    void UpdateGamma(unsigned short usGamma);
+    void MatrixMode(int type);
+    void MatrixSetIdentity();
+    void MatrixTranslate(float x, float y, float z);
+    void MatrixRotate(float angle, float x, float y, float z);
+    void MatrixScale(float x, float y, float z);
+    void MatrixPerspective(float fovy, float aspect, float zNear, float zFar);
+    void MatrixOrthogonal(float left, float right, float bottom, float top, float zNear, float zFar);
+    void MatrixPop();
+    void MatrixPush();
+    void MatrixMult(float *mat);
+    const float *MatrixGet(int type);
+    void Set_matrixDirty();
+    void Initialise(ID3D11Device *pDevice, IDXGISwapChain *pSwapChain);
+    ID3D11DeviceContext *InitialiseContext(bool fromPresent);
+    void StartFrame();
+    void DoScreenGrabOnNextPresent();
+    void Present();
+    void Clear(int flags, D3D11_RECT *pRect);
+    void SetClearColour(const float colourRGBA[4]);
+    bool IsWidescreen();
+    bool IsHiDef();
+    void CaptureThumbnail(ImageFileBuffer *pngOut);
+    void CaptureScreen(ImageFileBuffer *jpgOut, XSOCIAL_PREVIEWIMAGE *previewOut);
+    void BeginConditionalSurvey(int identifier);
+    void EndConditionalSurvey();
+    void BeginConditionalRendering(int identifier);
+    void EndConditionalRendering();
+    void DrawVertices(C4JRender::ePrimitiveType PrimitiveType, int count, void *dataIn, C4JRender::eVertexType vType,
+                      C4JRender::ePixelShaderType psType);
+    void DrawVertexBuffer(C4JRender::ePrimitiveType PrimitiveType, int count, ID3D11Buffer *buffer, C4JRender::eVertexType vType,
+                          C4JRender::ePixelShaderType psType);
+    void CBuffLockStaticCreations();
+    int CBuffCreate(int count);
+    void CBuffDelete(int first, int count);
+    void CBuffStart(int index, bool full);
+    void CBuffClear(int index);
+    int CBuffSize(int index);
+    void CBuffEnd();
+    bool CBuffCall(int index, bool full);
+    void CBuffTick();
+    void CBuffDeferredModeStart();
+    void CBuffDeferredModeEnd();
+    int TextureCreate();
+    void TextureFree(int idx);
+    void TextureBind(int idx);
+    void TextureBindVertex(int idx);
+    void TextureSetTextureLevels(int levels);
+    int TextureGetTextureLevels();
+    void TextureSetParam(int param, int value);
+    void TextureDynamicUpdateStart();
+    void TextureDynamicUpdateEnd();
+    void TextureData(int width, int height, void *data, int level, C4JRender::eTextureFormat format);
+    void TextureDataUpdate(int xoffset, int yoffset, int width, int height, void *data, int level);
+    HRESULT LoadTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut);
+    HRESULT LoadTextureData(BYTE *pbData, DWORD dwBytes, D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut);
+    HRESULT SaveTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int *ppDataOut);
+    HRESULT SaveTextureDataToMemory(void *pOutput, int outputCapacity, int *outputLength, int width, int height, int *ppDataIn);
+    void TextureGetStats();
+    ID3D11ShaderResourceView *TextureGetTexture(int idx);
+    void StateSetColour(float r, float g, float b, float a);
+    void StateSetDepthMask(bool enable);
+    void StateSetBlendEnable(bool enable);
+    void StateSetBlendFunc(int src, int dst);
+    void StateSetBlendFactor(unsigned int colour);
+    void StateSetAlphaFunc(int func, float param);
+    void StateSetDepthFunc(int func);
+    void StateSetFaceCull(bool enable);
+    void StateSetFaceCullCW(bool enable);
+    void StateSetLineWidth(float width);
+    void StateSetWriteEnable(bool red, bool green, bool blue, bool alpha);
+    void StateSetDepthTestEnable(bool enable);
+    void StateSetAlphaTestEnable(bool enable);
+    void StateSetDepthSlopeAndBias(float slope, float bias);
+    void StateSetFogEnable(bool enable);
+    void StateSetFogMode(int mode);
+    void StateSetFogNearDistance(float dist);
+    void StateSetFogFarDistance(float dist);
+    void StateSetFogDensity(float density);
+    void StateSetFogColour(float red, float green, float blue);
+    void StateSetLightingEnable(bool enable);
+    void StateSetVertexTextureUV(float u, float v);
+    void StateSetLightColour(int light, float red, float green, float blue);
+    void StateSetLightAmbientColour(float red, float green, float blue);
+    void StateSetLightDirection(int light, float x, float y, float z);
+    void StateSetLightEnable(int light, bool enable);
+    void StateSetViewport(C4JRender::eViewportType viewportType);
+    void StateSetEnableViewportClipPlanes(bool enable);
+    void StateSetTexGenCol(int col, float x, float y, float z, float w, bool eyeSpace);
+    void StateSetStencil(D3D11_COMPARISON_FUNC function, uint8_t stencil_ref, uint8_t stencil_func_mask, uint8_t stencil_write_mask);
+    void StateSetForceLOD(int LOD);
+    void BeginEvent(LPCWSTR eventName);
+    void EndEvent();
+    void Suspend();
+    bool Suspended();
+    void Resume();
+    void StateUpdate();
 private:
-	void SetupShaders();
-	void ConvertLinearToPng(ImageFileBuffer* pngOut, unsigned char* linearData, unsigned int width, unsigned int height);
-	void DrawVertexSetup(C4JRender::eVertexType vType, C4JRender::ePixelShaderType psType, C4JRender::ePrimitiveType primitiveType, int* count, bool* drawIndexed);
-	void UpdateTexGenState();
-	void UpdateLightingState();
-	void UpdateViewportState();
-	void UpdateFogState();
-	void UpdateTextureState(bool vertexSampler);
-	void MultWithStack(DirectX::XMMATRIX matrix);
-	ID3D11DepthStencilState* GetManagedDepthStencilState();
-	ID3D11BlendState* GetManagedBlendState();
-	ID3D11RasterizerState* GetManagedRasterizerState();
-	ID3D11SamplerState* GetManagedSamplerState();
-	void DeleteInternalBuffer(int index);
-	Renderer::Context& getContext();
-	static D3D11_PRIMITIVE_TOPOLOGY* m_Topologies;
-	static DXGI_FORMAT textureFormats[C4JRender::MAX_TEXTURE_FORMATS];
-
+    void SetupShaders();
+    void ConvertLinearToPng(ImageFileBuffer *pngOut, unsigned char *linearData, unsigned int width, unsigned int height);
+    void DrawVertexSetup(C4JRender::eVertexType vType, C4JRender::ePixelShaderType psType, C4JRender::ePrimitiveType primitiveType, int *count,
+                         bool *drawIndexed);
+    void UpdateTexGenState();
+    void UpdateLightingState();
+    void UpdateViewportState();
+    void UpdateFogState();
+    void UpdateTextureState(bool vertexSampler);
+    void MultWithStack(DirectX::XMMATRIX matrix);
+    ID3D11DepthStencilState *GetManagedDepthStencilState();
+    ID3D11BlendState *GetManagedBlendState();
+    ID3D11RasterizerState *GetManagedRasterizerState();
+    ID3D11SamplerState *GetManagedSamplerState();
+    void DeleteInternalBuffer(int index);
+    Renderer::Context &getContext();
+    static D3D11_PRIMITIVE_TOPOLOGY *m_Topologies;
+    static DXGI_FORMAT textureFormats[C4JRender::MAX_TEXTURE_FORMATS];
 public:
+    struct Texture
+    {
+        bool allocated;
+        ID3D11Texture2D *texture;
+        ID3D11ShaderResourceView *view;
+        DWORD textureFlags;
+        DWORD mipLevels;
+        DWORD textureFormat;
+        DWORD samplerParams;
+    };

-	struct Texture
-	{
-		bool allocated;
-		ID3D11Texture2D* texture;
-		ID3D11ShaderResourceView* view;
-		DWORD textureFlags;
-		DWORD mipLevels;
-		DWORD textureFormat;
-		DWORD samplerParams;
-	};
+    struct TexgenCBuffer
+    {
+        DirectX::XMMATRIX unk0;
+        DirectX::XMMATRIX unk1;
+    };

-	struct TexgenCBuffer
-	{
-		DirectX::XMMATRIX unk0;
-		DirectX::XMMATRIX unk1;
-	};
+    enum eCommandType
+    {
+        COMMAND_ADD_MATRIX,
+        COMMAND_ADD_VERTICES,
+        COMMAND_BIND_TEXTURE,
+        COMMAND_SET_COLOR,
+        COMMAND_SET_DEPTH_FUNC,
+        COMMAND_SET_DEPTH_MASK,
+        COMMAND_SET_DEPTH_TEST,
+        COMMAND_SET_LIGHTING_ENABLE,
+        COMMAND_SET_LIGHT_ENABLE,
+        COMMAND_SET_LIGHT_DIRECTION,
+        COMMAND_SET_LIGHT_COLOUR,
+        COMMAND_SET_LIGHT_AMBIENT_COLOUR,
+        COMMAND_SET_BLEND_ENABLE,
+        COMMAND_SET_BLEND_FUNC,
+        COMMAND_SET_BLEND_FACTOR,
+        COMMAND_SET_FACE_CULL,
+    };

-	enum eCommandType
-	{
-		COMMAND_ADD_MATRIX,
-		COMMAND_ADD_VERTICES,
-		COMMAND_BIND_TEXTURE,
-		COMMAND_SET_COLOR,
-		COMMAND_SET_DEPTH_FUNC,
-		COMMAND_SET_DEPTH_MASK,
-		COMMAND_SET_DEPTH_TEST,
-		COMMAND_SET_LIGHTING_ENABLE,
-		COMMAND_SET_LIGHT_ENABLE,
-		COMMAND_SET_LIGHT_DIRECTION,
-		COMMAND_SET_LIGHT_COLOUR,
-		COMMAND_SET_LIGHT_AMBIENT_COLOUR,
-		COMMAND_SET_BLEND_ENABLE,
-		COMMAND_SET_BLEND_FUNC,
-		COMMAND_SET_BLEND_FACTOR,
-		COMMAND_SET_FACE_CULL,
-	};
+    struct CommandBuffer
+    {
+        CommandBuffer(bool full);
+        ~CommandBuffer();
+        void StartRecording();
+        void EndRecording(ID3D11Device *device);
+        std::uint64_t GetAllocated();
+        bool IsBusy();
+        void AddMatrix(const float *matrix);
+        void AddVertices(unsigned int stride, unsigned int count, void *dataIn, Renderer::Context &c);
+        void BindTexture(int idx);
+        void SetColor(float r, float g, float b, float a);
+        void SetDepthFunc(int func);
+        void SetDepthMask(bool enable);
+        void SetDepthTestEnable(bool enable);
+        void SetLightingEnable(bool enable);
+        void SetLightEnable(int light, bool enable);
+        void SetLightDirection(int light, float x, float y, float z);
+        void SetLightColour(int light, float r, float g, float b);
+        void SetLightAmbientColour(float r, float g, float b);
+        void SetBlendEnable(bool enable);
+        void SetBlendFunc(int src, int dst);
+        void SetBlendFactor(unsigned int factor);
+        void SetFaceCull(bool enable);
+        void Render(C4JRender::eVertexType vType, Renderer::Context &c, int primitiveType);

-	struct CommandBuffer
-	{
-		CommandBuffer(bool full);
-		~CommandBuffer();
-		void StartRecording();
-		void EndRecording(ID3D11Device* device);
-		std::uint64_t GetAllocated();
-		bool IsBusy();
-		void AddMatrix(const float* matrix);
-		void AddVertices(unsigned int stride, unsigned int count, void* dataIn, Renderer::Context& context);
-		void BindTexture(int idx);
-		void SetColor(float r, float g, float b, float a);
-		void SetDepthFunc(int func);
-		void SetDepthMask(bool enable);
-		void SetDepthTestEnable(bool enable);
-		void SetLightingEnable(bool enable);
-		void SetLightEnable(int light, bool enable);
-		void SetLightDirection(int light, float x, float y, float z);
-		void SetLightColour(int light, float r, float g, float b);
-		void SetLightAmbientColour(float r, float g, float b);
-		void SetBlendEnable(bool enable);
-		void SetBlendFunc(int src, int dst);
-		void SetBlendFactor(unsigned int factor);
-		void SetFaceCull(bool enable);
-		void Render(C4JRender::eVertexType vertexType, Renderer::Context& context, int primitiveType);
+        struct Command
+        {
+            Renderer::eCommandType m_command_type;
+            BYTE commandPadding[12];

-		struct Command
-		{
-			Renderer::eCommandType m_command_type;
-			BYTE commandPadding[12];
+            union
+            {
+                BYTE data[64];

-			union
-			{
-				BYTE data[64];
+                struct
+                {
+                    float m_matrix[16];
+                    // DirectX::XMMATRIX m_matrix;
+                } add_matrix;

-				struct
-				{
-					float m_matrix[16];
-					//DirectX::XMMATRIX m_matrix;
-				} add_matrix;
+                struct
+                {
+                    unsigned int m_vertex_index_start;
+                    unsigned int m_vertex_count;
+                } add_vertices;

-				struct
-				{
-					unsigned int m_vertex_index_start;
-					unsigned int m_vertex_count;
-				} add_vertices;
+                struct
+                {
+                    unsigned int m_texture_index;
+                } bind_texture;

-				struct
-				{
-					unsigned int m_texture_index;
-				} bind_texture;
+                struct
+                {
+                    float m_color[4];
+                } set_color;

-				struct
-				{
-					float m_color[4];
-				} set_color;
+                struct
+                {
+                    int m_depth_func;
+                } set_depth_func;

-				struct
-				{
-					int m_depth_func;
-				} set_depth_func;
+                struct
+                {
+                    bool m_enable;
+                } set_depth_mask;

-				struct
-				{
-					bool m_enable;
-				} set_depth_mask;
+                struct
+                {
+                    bool m_enable;
+                } set_depth_test;

-				struct
-				{
-					bool m_enable;
-				} set_depth_test;
+                struct
+                {
+                    bool m_enable;
+                } set_lighting_enable;

-				struct
-				{
-					bool m_enable;
-				} set_lighting_enable;
+                struct
+                {
+                    int m_light_index;
+                    bool m_enable;
+                } set_light_enable;

-				struct
-				{
-					int m_light_index;
-					bool m_enable;
-				} set_light_enable;
+                struct
+                {
+                    int m_light_index;
+                    float padding[3];
+                    float m_direction[4];
+                } set_light_direction;

-				struct
-				{
-					int m_light_index;
-					float padding[3];
-					float m_direction[4];
-				} set_light_direction;
+                struct
+                {
+                    int m_light_index;
+                    float m_color[3];
+                } set_light_colour;

-				struct
-				{
-					int m_light_index;
-					float m_color[3];
-				} set_light_colour;
+                struct
+                {
+                    BYTE padding;
+                    float m_color[3];
+                } set_light_ambient_colour;

-				struct
-				{
-					BYTE padding;
-					float m_color[3];
-				} set_light_ambient_colour;
+                struct
+                {
+                    bool m_enable;
+                } set_blend_enable;

-				struct
-				{
-					bool m_enable;
-				} set_blend_enable;
+                struct
+                {
+                    int m_src;
+                    int m_dst;
+                } set_blend_func;

-				struct
-				{
-					int m_src;
-					int m_dst;
-				} set_blend_func;
+                struct
+                {
+                    unsigned int m_blend_factor;
+                } set_blend_factor;

-				struct
-				{
-					unsigned int m_blend_factor;
-				} set_blend_factor;
+                struct
+                {
+                    bool m_enable;
+                } set_face_cull;
+            };
+        };
+        ID3D11Buffer *m_vertexBuffer;
+        void *m_vertexData;
+        std::uint64_t m_vertexDataLength;
+        std::vector<Command> m_commands;
+        std::uint64_t m_allocated;
+        BYTE isActive;
+    };

-				struct
-				{
-					bool m_enable;
-				} set_face_cull;
-			};
-		};
-		ID3D11Buffer* m_vertexBuffer;
-		void* m_vertexData;
-		std::uint64_t m_vertexDataLength;
-		std::vector<Command> m_commands;
-		std::uint64_t m_allocated;
-		BYTE isActive;
-		BYTE paddingAfterActive[7];
+    struct DeferredCBuff
+    {
+        Renderer::CommandBuffer *m_command_buf;
+        int m_vertex_index;
+        int m_vertex_type;
+        int m_primitive_type;
+        DirectX::XMMATRIX m_matrix;
+    };

+    struct Context
+    {
+        static const unsigned int VERTEX_BUFFER_SIZE = 0x100000;

-	};
+        Context(ID3D11Device *device, ID3D11DeviceContext *deviceContext);

-	struct DeferredCBuff
-	{
-		Renderer::CommandBuffer* m_command_buf;
-		int m_vertex_index;
-		int m_vertex_type;
-		int m_primitive_type;
-		DirectX::XMMATRIX m_matrix;
-	};
+        ID3D11DeviceContext *m_pDeviceContext;
+        ID3DUserDefinedAnnotation *userAnnotation;
+        DWORD annotateDepth;
+        DirectX::XMMATRIX matrixStacks[MATRIX_MODE_MODELVIEW_MAX][STACK_SIZE];
+        bool matrixDirty[MATRIX_MODE_MODELVIEW_MAX];
+        DWORD stackPos[MATRIX_MODE_MODELVIEW_MAX];
+        DWORD stackType;
+        DWORD textureIdx;
+        BYTE faceCullEnabled;
+        BYTE depthTestEnabled;
+        BYTE alphaTestEnabled;
+        float alphaReference;
+        BYTE depthWriteEnabled;
+        BYTE fogEnabled;
+        float fogNearDistance;
+        float fogFarDistance;
+        float fogDensity;
+        float fogColourRed;
+        float fogColourBlue;
+        float fogColourGreen;
+        DWORD fogMode;
+        BYTE lightingEnabled;
+        BYTE lightEnabled[2];
+        BYTE lightingDirty;
+        DWORD forcedLOD;
+        BYTE paddingAfterForceLOD[4];
+        DirectX::XMFLOAT4 lightDirection[2];
+        DirectX::XMFLOAT4 lightColour[2];
+        DirectX::XMFLOAT4 lightAmbientColour;
+        ID3D11Buffer *m_modelViewMatrix;
+        ID3D11Buffer *m_localTransformMatrix;
+        ID3D11Buffer *m_projectionMatrix;
+        ID3D11Buffer *m_textureMatrix;
+        ID3D11Buffer *m_vertexTexcoordBuffer;
+        ID3D11Buffer *m_fogParamsBuffer;
+        ID3D11Buffer *m_lightingStateBuffer;
+        ID3D11Buffer *m_texGenMatricesBuffer;
+        ID3D11Buffer *m_compressedTranslationBuffer;
+        ID3D11Buffer *m_thumbnailBoundsBuffer;
+        ID3D11Buffer *m_tintColorBuffer;
+        ID3D11Buffer *m_fogColourBuffer;
+        ID3D11Buffer *m_unkColorBuffer;
+        ID3D11Buffer *m_alphaTestBuffer;
+        ID3D11Buffer *m_clearColorBuffer;
+        ID3D11Buffer *m_forcedLODBuffer;
+        uint64_t dynamicVertexBase;
+        DWORD dynamicVertexOffset;
+        ID3D11Buffer *dynamicVertexBuffer;
+        DirectX::XMMATRIX texGenMatrices[2];
+        Renderer::CommandBuffer *commandBuffer;
+        DWORD recordingBufferIndex;
+        DWORD recordingVertexType;
+        DWORD recordingPrimitiveType;
+        BYTE deferredModeEnabled;
+        std::vector<DeferredCBuff> deferredBuffers;
+        D3D11_BLEND_DESC blendDesc;
+        D3D11_DEPTH_STENCIL_DESC depthStencilDesc;
+        D3D11_RASTERIZER_DESC rasterizerDesc;
+        float blendFactor[4];
+    };

-	struct Context
-	{
-		Context(ID3D11Device* device, ID3D11DeviceContext* deviceContext);
+    static DWORD tlsIdx;
+    static unsigned int s_auiWidths[MAX_MIP_LEVELS + 1];
+    static unsigned int s_auiHeights[MAX_MIP_LEVELS + 1];
+    static D3D11_INPUT_ELEMENT_DESC g_vertex_PTN_Elements_PF3_TF2_CB4_NB4_XW1[5];
+    static D3D11_INPUT_ELEMENT_DESC g_vertex_PTN_Elements_Compressed[2];
+    static D3D11_PRIMITIVE_TOPOLOGY g_topologies[C4JRender::PRIMITIVE_TYPE_COUNT];
+    static int totalAlloc;
+    static _RTL_CRITICAL_SECTION totalAllocCS;

-		ID3D11DeviceContext* m_pDeviceContext;
-		ID3DUserDefinedAnnotation* userAnnotation;
-		DWORD contextStateFlags;
-		BYTE paddingAfterFlags[12];
-		DirectX::XMMATRIX matrixStacks[4][16];
-		bool matrixDirty[4];
-		DWORD matrixStackDepth[4];
-		DWORD matrixModeType;
-		DWORD boundTextureIndex;
-		BYTE faceCullEnabled;
-		BYTE depthTestEnabled;
-		BYTE alphaTestEnabled;
-		float alphaReference;
-		BYTE depthWriteEnabled;
-		BYTE fogEnabled;
-		BYTE paddingAfterFogFlags[2];
-		float fogNearDistance;
-		float fogFarDistance;
-		float fogDensity;
-		float fogColourRed;
-		float fogColourBlue;
-		float fogColourGreen;
-		DWORD fogMode;
-		BYTE lightingEnabled;
-		BYTE lightEnabled[2];
-		BYTE lightingDirty;
-		DWORD forcedLOD;
-		BYTE paddingAfterForceLOD[4];
-		DirectX::XMFLOAT4 lightDirection[2];
-		DirectX::XMFLOAT4 lightColour[2];
-		DirectX::XMFLOAT4 lightAmbientColour;
-		ID3D11Buffer* cbMatrix0;
-		ID3D11Buffer* cbMatrix1;
-		ID3D11Buffer* cbMatrix2;
-		ID3D11Buffer* cbMatrix3;
-		ID3D11Buffer* cbVertexTexcoord;
-		ID3D11Buffer* cbFogParams;
-		ID3D11Buffer* cbLighting;
-		ID3D11Buffer* cbTexGen;
-		ID3D11Buffer* cbAux0;
-		ID3D11Buffer* cbAux1;
-		ID3D11Buffer* cbColour;
-		ID3D11Buffer* cbFogColour;
-		ID3D11Buffer* cbAux2;
-		ID3D11Buffer* cbAlphaTest;
-		ID3D11Buffer* cbAux3;
-		ID3D11Buffer* cbAux4;
-		uint64_t dynamicVertexBase;
-		DWORD dynamicVertexOffset;
-		BYTE paddingAfterDynamicOffset[4];
-		ID3D11Buffer* dynamicVertexBuffer;
-		BYTE paddingBeforeTexGen[8];
-		DirectX::XMMATRIX texGenMatrices[2];
-		Renderer::CommandBuffer* commandBuffer;
-		DWORD recordingBufferIndex;
-		DWORD recordingVertexType;
-		DWORD recordingPrimitiveType;
-		BYTE deferredModeEnabled;
-		BYTE paddingAfterDeferredModeEnabled[3];
-		std::vector<DeferredCBuff> deferredBuffers;
-		D3D11_BLEND_DESC blendDesc;
-		D3D11_DEPTH_STENCIL_DESC depthStencilDesc;
-		D3D11_RASTERIZER_DESC rasterizerDesc;
-		float blendFactor[4];
-		DWORD reservedContext0;
-		DWORD reservedContext1;
-	};
-
-	static DWORD tlsIdx;
-	static unsigned int s_auiWidths[MAX_MIP_LEVELS + 1];
-	static unsigned int s_auiHeights[MAX_MIP_LEVELS + 1];
-	static D3D11_INPUT_ELEMENT_DESC g_vertex_PTN_Elements_PF3_TF2_CB4_NB4_XW1[5];
-	static D3D11_INPUT_ELEMENT_DESC g_vertex_PTN_Elements_Compressed[2];
-	static D3D11_PRIMITIVE_TOPOLOGY g_topologies[C4JRender::PRIMITIVE_TYPE_COUNT];
-	static int totalAlloc;
-	static _RTL_CRITICAL_SECTION totalAllocCS;
-
-	float m_fClearColor[4];
-	ID3D11Device* m_pDevice;
-	ID3D11DeviceContext* m_pDeviceContext;
-	IDXGISwapChain* m_pSwapChain;
-	ID3D11RenderTargetView* renderTargetView;
-	ID3D11RenderTargetView* renderTargetViews[4];
-	ID3D11ShaderResourceView* renderTargetShaderResourceView;
-	ID3D11ShaderResourceView* renderTargetShaderResourceViews[4];
-	ID3D11Texture2D* renderTargetTextures[4];
-	ID3D11DepthStencilView* depthStencilView;
-	ID3D11VertexShader** vertexShaderTable;
-	ID3D11VertexShader* screenSpaceVertexShader;
-	ID3D11VertexShader* screenClearVertexShader;
-	ID3D11PixelShader** pixelShaderTable;
-	ID3D11PixelShader* screenSpacePixelShader;
-	ID3D11PixelShader* screenClearPixelShader;
-	unsigned int* vertexStrideTable;
-	ID3D11InputLayout** inputLayoutTable;
-	ID3D11Buffer* quadIndexBuffer;
-	ID3D11Buffer* fanIndexBuffer;
-	DWORD defaultTextureIndex;
-	WORD reservedRendererWord0;
-	BYTE paddingAfterRendererWord0[2];
-	DWORD presentCount;
-	BYTE rendererFlag0;
-	BYTE paddingAfterRendererFlag0[3];
-	_RTL_CRITICAL_SECTION rtl_critical_section100;
-	DWORD activeVertexType;
-	DWORD activePixelType;
-	C4JRender::eViewportType m_ViewportType;
-	BYTE reservedRendererByte0;
-	BYTE paddingAfterViewportType[3];
-	Renderer::Texture m_textures[MAX_TEXTURES];
-	DWORD backBufferWidth;
-	DWORD backBufferHeight;
-	BYTE reservedRendererByte1;
-	BYTE paddingAfterRendererByte1[3];
-	DWORD reservedRendererDword1;
-	void* reservedRendererPtr2;
-	void* reservedRendererPtr3;
-	uint64_t reservedRendererPtr1;
-	void* reservedRendererPtr4;
-	void* reservedRendererPtr5;
-	void* reservedRendererPtr6;
-	DWORD reservedRendererDword2;
-	DWORD reservedRendererDword3;
-	std::unordered_map<int, ID3D11BlendState*> managedBlendStates;
-	std::unordered_map<int, ID3D11DepthStencilState*> managedDepthStencilStates;
-	std::unordered_map<int, ID3D11SamplerState*> managedSamplerStates;
-	std::unordered_map<int, ID3D11RasterizerState*> managedRasterizerStates;
-	bool m_bShouldScreenGrabNextFrame;
-	BYTE m_bSuspended;
-	BYTE paddingAfterSuspendState[2];
+    float m_fClearColor[4];
+    ID3D11Device *m_pDevice;
+    ID3D11DeviceContext *m_pDeviceContext;
+    IDXGISwapChain *m_pSwapChain;
+    ID3D11RenderTargetView *renderTargetView;
+    ID3D11RenderTargetView *renderTargetViews[4];
+    ID3D11ShaderResourceView *renderTargetShaderResourceView;
+    ID3D11ShaderResourceView *renderTargetShaderResourceViews[4];
+    ID3D11Texture2D *renderTargetTextures[4];
+    ID3D11DepthStencilView *depthStencilView;
+    ID3D11VertexShader **vertexShaderTable;
+    ID3D11VertexShader *screenSpaceVertexShader;
+    ID3D11VertexShader *screenClearVertexShader;
+    ID3D11PixelShader **pixelShaderTable;
+    ID3D11PixelShader *screenSpacePixelShader;
+    ID3D11PixelShader *screenClearPixelShader;
+    unsigned int *vertexStrideTable;
+    ID3D11InputLayout **inputLayoutTable;
+    ID3D11Buffer *quadIndexBuffer;
+    ID3D11Buffer *fanIndexBuffer;
+    DWORD defaultTextureIndex;
+    WORD reservedRendererWord0;
+    BYTE paddingAfterRendererWord0[2];
+    DWORD presentCount;
+    BYTE rendererFlag0;
+    BYTE paddingAfterRendererFlag0[3];
+    _RTL_CRITICAL_SECTION rtl_critical_section100;
+    DWORD activeVertexType;
+    DWORD activePixelType;
+    C4JRender::eViewportType m_ViewportType;
+    BYTE reservedRendererByte0;
+    BYTE paddingAfterViewportType[3];
+    Renderer::Texture m_textures[512];
+    DWORD backBufferWidth;
+    DWORD backBufferHeight;
+    BYTE reservedRendererByte1;
+    BYTE paddingAfterRendererByte1[3];
+    DWORD reservedRendererDword1;
+    int16_t *m_commandHandleToIndex;
+    CommandBuffer **m_commandBuffers;
+    uint8_t *m_commandPrimitiveTypes;
+    DirectX::XMMATRIX *m_commandMatrices;
+    int *m_commandIndexToHandle;
+    uint8_t *m_commandVertexTypes;
+    DWORD reservedRendererDword2;
+    DWORD reservedRendererDword3;
+    std::unordered_map<int, ID3D11BlendState *> managedBlendStates;
+    std::unordered_map<int, ID3D11DepthStencilState *> managedDepthStencilStates;
+    std::unordered_map<int, ID3D11SamplerState *> managedSamplerStates;
+    std::unordered_map<int, ID3D11RasterizerState *> managedRasterizerStates;
+    BYTE shouldScreenGrabNextFrame;
+    BYTE suspended;
+    BYTE paddingAfterSuspendState[2];
 };

 // Singleton
@@ -3,109 +3,117 @@

 #include <cstring>

-const float* Renderer::MatrixGet(int type)
+const float *Renderer::MatrixGet(int type)
 {
-	Context& context = this->getContext();
-	const int depth = context.matrixStackDepth[type];
-	return reinterpret_cast<const float*>(&context.matrixStacks[type][depth]);
+    Context &c = this->getContext();
+    const int depth = c.stackPos[type];
+    return reinterpret_cast<const float *>(&c.matrixStacks[type][depth]);
 }

 void Renderer::MatrixMode(int type)
 {
-	Context& context = this->getContext();
-	context.matrixModeType = type;
+    Context &c = this->getContext();
+    assert(type >= 0);
+    assert(type < STACK_TYPES);
+    c.stackType = type;
 }

-void Renderer::MatrixMult(float* mat)
+void Renderer::MatrixMult(float *mat)
 {
-	DirectX::XMMATRIX matrix;
-	std::memcpy(&matrix, mat, sizeof(matrix));
-	this->MultWithStack(matrix);
+    DirectX::XMMATRIX matrix;
+    std::memcpy(&matrix, mat, sizeof(matrix));
+    this->MultWithStack(matrix);
 }

 void Renderer::MatrixOrthogonal(float left, float right, float bottom, float top, float zNear, float zFar)
 {
-	const DirectX::XMMATRIX matrix = DirectX::XMMatrixOrthographicOffCenterRH(left, right, bottom, top, zNear, zFar);
-	this->MultWithStack(matrix);
+    const DirectX::XMMATRIX matrix = DirectX::XMMatrixOrthographicOffCenterRH(left, right, bottom, top, zNear, zFar);
+    this->MultWithStack(matrix);
 }

 void Renderer::MatrixPerspective(float fovy, float aspect, float zNear, float zFar)
 {
-	const float fovRadians = fovy * (3.14159274f / 180.0f);
-	const DirectX::XMMATRIX matrix = DirectX::XMMatrixPerspectiveFovRH(fovRadians, aspect, zNear, zFar);
-	this->MultWithStack(matrix);
+    const float fovRadians = fovy * (3.14159274f / 180.0f);
+    const DirectX::XMMATRIX matrix = DirectX::XMMatrixPerspectiveFovRH(fovRadians, aspect, zNear, zFar);
+    this->MultWithStack(matrix);
 }

 void Renderer::MatrixPop()
 {
-	Context& context = this->getContext();
-	const int mode = context.matrixModeType;
-	--context.matrixStackDepth[mode];
-	context.matrixDirty[mode] = true;
+    Context &c = this->getContext();
+
+    assert(c.stackPos[c.stackType] > 0);
+
+    const int mode = c.stackType;
+    --c.stackPos[mode];
+    c.matrixDirty[mode] = true;
 }

 void Renderer::MatrixPush()
 {
-	Context& context = this->getContext();
-	const int mode = context.matrixModeType;
-	const int depth = context.matrixStackDepth[mode];
-	context.matrixStacks[mode][depth + 1] = context.matrixStacks[mode][depth];
-	++context.matrixStackDepth[mode];
+    Context &c = this->getContext();
+    
+    assert(c.stackPos[c.stackType] < (STACK_SIZE - 1));
+
+    const int mode = c.stackType;
+    const int depth = c.stackPos[mode];
+    c.matrixStacks[mode][depth + 1] = c.matrixStacks[mode][depth];
+    ++c.stackPos[mode];
 }

 void Renderer::MatrixRotate(float angle, float x, float y, float z)
 {
-	const DirectX::XMVECTOR axis = DirectX::XMVectorSet(x, y, z, 0.0f);
-	const DirectX::XMMATRIX matrix = DirectX::XMMatrixRotationAxis(axis, angle);
-	this->MultWithStack(matrix);
+    const DirectX::XMVECTOR axis = DirectX::XMVectorSet(x, y, z, 0.0f);
+    const DirectX::XMMATRIX matrix = DirectX::XMMatrixRotationAxis(axis, angle);
+    this->MultWithStack(matrix);
 }

 void Renderer::MatrixScale(float x, float y, float z)
 {
-	const DirectX::XMMATRIX matrix = DirectX::XMMatrixScaling(x, y, z);
-	this->MultWithStack(matrix);
+    const DirectX::XMMATRIX matrix = DirectX::XMMatrixScaling(x, y, z);
+    this->MultWithStack(matrix);
 }

 void Renderer::MatrixSetIdentity()
 {
-	Context& context = this->getContext();
-	const int mode = context.matrixModeType;
-	const int depth = context.matrixStackDepth[mode];
-	context.matrixStacks[mode][depth] = DirectX::XMMatrixIdentity();
-	context.matrixDirty[mode] = true;
+    Context &c = this->getContext();
+    const int mode = c.stackType;
+    const int depth = c.stackPos[mode];
+    c.matrixStacks[mode][depth] = DirectX::XMMatrixIdentity();
+    c.matrixDirty[mode] = true;
 }

 void Renderer::MatrixTranslate(float x, float y, float z)
 {
-	const DirectX::XMMATRIX matrix = DirectX::XMMatrixTranslation(x, y, z);
-	this->MultWithStack(matrix);
+    const DirectX::XMMATRIX matrix = DirectX::XMMatrixTranslation(x, y, z);
+    this->MultWithStack(matrix);
 }

 void Renderer::MultWithStack(DirectX::XMMATRIX matrix)
 {
-	Context& context = this->getContext();
-	const int mode = context.matrixModeType;
-	const int depth = context.matrixStackDepth[mode];
-	DirectX::XMMATRIX& current = context.matrixStacks[mode][depth];
-	current = DirectX::XMMatrixMultiply(matrix, current);
-	context.matrixDirty[mode] = true;
+    Context &c = this->getContext();
+    const int mode = c.stackType;
+    const int depth = c.stackPos[mode];
+    DirectX::XMMATRIX &current = c.matrixStacks[mode][depth];
+    current = DirectX::XMMatrixMultiply(matrix, current);
+    c.matrixDirty[mode] = true;
 }

 void Renderer::Set_matrixDirty()
 {
-	Context& context = this->getContext();
-	const DirectX::XMMATRIX identity = DirectX::XMMatrixIdentity();
+    Context &c = this->getContext();
+    const DirectX::XMMATRIX identity = DirectX::XMMatrixIdentity();

-	context.matrixStacks[0][0] = identity;
-	context.matrixStacks[1][0] = identity;
-	context.matrixStacks[2][0] = identity;
-	context.matrixStacks[3][0] = identity;
+    c.matrixStacks[MATRIX_MODE_MODELVIEW][0] = identity;
+    c.matrixStacks[MATRIX_MODE_MODELVIEW_PROJECTION][0] = identity;
+    c.matrixStacks[MATRIX_MODE_MODELVIEW_TEXTURE][0] = identity;
+    c.matrixStacks[MATRIX_MODE_MODELVIEW_CBUFF][0] = identity;

-	context.matrixDirty[0] = true;
-	context.matrixDirty[1] = true;
-	context.matrixDirty[2] = true;
-	context.matrixDirty[3] = true;
+    c.matrixDirty[MATRIX_MODE_MODELVIEW] = true;
+    c.matrixDirty[MATRIX_MODE_MODELVIEW_PROJECTION] = true;
+    c.matrixDirty[MATRIX_MODE_MODELVIEW_TEXTURE] = true;
+    c.matrixDirty[MATRIX_MODE_MODELVIEW_CBUFF] = true;

-	activeVertexType = 0xFFFFFFFFu;
-	activePixelType = 0xFFFFFFFFu;
+    activeVertexType = 0xFFFFFFFFu;
+    activePixelType = 0xFFFFFFFFu;
 }
@@ -5,181 +5,172 @@
 #include <cstdio>
 #include <cstring>

-D3D11_PRIMITIVE_TOPOLOGY* Renderer::m_Topologies = nullptr;
+D3D11_PRIMITIVE_TOPOLOGY *Renderer::m_Topologies = nullptr;

-void Renderer::DrawVertexBuffer(
-	C4JRender::ePrimitiveType PrimitiveType,
-	int count,
-	ID3D11Buffer* buffer,
-	C4JRender::eVertexType vType,
-	C4JRender::ePixelShaderType psType)
+void Renderer::DrawVertexBuffer(C4JRender::ePrimitiveType PrimitiveType, int count, ID3D11Buffer *buffer, C4JRender::eVertexType vType,
+                                C4JRender::ePixelShaderType psType)
 {
-	Renderer::Context& context = this->getContext();
-	ID3D11DeviceContext* d3d11 = context.m_pDeviceContext;
+    Renderer::Context &c = this->getContext();
+    ID3D11DeviceContext *d3d11 = c.m_pDeviceContext;

-	int drawCount = count;
-	bool indexed = false;
-	this->DrawVertexSetup(vType, psType, PrimitiveType, &drawCount, &indexed);
-	this->StateUpdate();
+    int drawCount = count;
+    bool indexed = false;
+    this->DrawVertexSetup(vType, psType, PrimitiveType, &drawCount, &indexed);
+    this->StateUpdate();

-	const UINT stride = vertexStrideTable[vType];
-	const UINT offset = 0;
-	d3d11->IASetVertexBuffers(0, 1, &buffer, &stride, &offset);
+    const UINT stride = vertexStrideTable[vType];
+    const UINT offset = 0;
+    d3d11->IASetVertexBuffers(0, 1, &buffer, &stride, &offset);

-	if (indexed)
-	{
-		d3d11->DrawIndexed(drawCount, 0, 0);
-	}
-	else
-	{
-		d3d11->Draw(count, 0);
-	}
+    if (indexed)
+    {
+        d3d11->DrawIndexed(drawCount, 0, 0);
+    }
+    else
+    {
+        d3d11->Draw(count, 0);
+    }
 }

-void Renderer::DrawVertexSetup(
-	C4JRender::eVertexType vType,
-	C4JRender::ePixelShaderType psType,
-	C4JRender::ePrimitiveType PrimitiveType,
-	int* count,
-	bool* indexed)
+void Renderer::DrawVertexSetup(C4JRender::eVertexType vType, C4JRender::ePixelShaderType psType, C4JRender::ePrimitiveType PrimitiveType, int *count,
+                               bool *indexed)
 {
-	Renderer::Context& context = this->getContext();
-	ID3D11DeviceContext* d3d11 = context.m_pDeviceContext;
+    Renderer::Context &c = this->getContext();
+    ID3D11DeviceContext *d3d11 = c.m_pDeviceContext;

-	C4JRender::eVertexType effectiveVertexType = vType;
-	if (effectiveVertexType == C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 && context.lightingEnabled)
-	{
-		effectiveVertexType = C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_LIT;
-	}
+    C4JRender::eVertexType effectiveVertexType = vType;
+    if (effectiveVertexType == C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 && c.lightingEnabled)
+    {
+        effectiveVertexType = C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_LIT;
+    }

-	if (effectiveVertexType != activeVertexType)
-	{
-		d3d11->VSSetShader(vertexShaderTable[effectiveVertexType], nullptr, 0);
-		d3d11->IASetInputLayout(inputLayoutTable[effectiveVertexType]);
-		activeVertexType = effectiveVertexType;
-	}
+    if (effectiveVertexType != activeVertexType)
+    {
+        d3d11->VSSetShader(vertexShaderTable[effectiveVertexType], nullptr, 0);
+        d3d11->IASetInputLayout(inputLayoutTable[effectiveVertexType]);
+        activeVertexType = effectiveVertexType;
+    }

-	if (psType != activePixelType)
-	{
-		d3d11->PSSetShader(pixelShaderTable[psType], nullptr, 0);
-		activePixelType = psType;
-	}
+    if (psType != activePixelType)
+    {
+        d3d11->PSSetShader(pixelShaderTable[psType], nullptr, 0);
+        activePixelType = psType;
+    }

-	D3D11_MAPPED_SUBRESOURCE mapped = {};
+    D3D11_MAPPED_SUBRESOURCE mapped = {};

-	if (context.matrixDirty[0])
-	{
-		d3d11->Map(context.cbMatrix0, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped);
-		std::memcpy(mapped.pData, this->MatrixGet(0), sizeof(DirectX::XMMATRIX));
-		d3d11->Unmap(context.cbMatrix0, 0);
-		context.matrixDirty[0] = false;
-	}
+    if (c.matrixDirty[MATRIX_MODE_MODELVIEW])
+    {
+        d3d11->Map(c.m_modelViewMatrix, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped);
+        std::memcpy(mapped.pData, this->MatrixGet(MATRIX_MODE_MODELVIEW), sizeof(DirectX::XMMATRIX));
+        d3d11->Unmap(c.m_modelViewMatrix, 0);
+        c.matrixDirty[MATRIX_MODE_MODELVIEW] = false;
+    }

-	if (context.matrixDirty[1])
-	{
-		d3d11->Map(context.cbMatrix2, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped);
-		std::memcpy(mapped.pData, this->MatrixGet(1), sizeof(DirectX::XMMATRIX));
-		d3d11->Unmap(context.cbMatrix2, 0);
-		context.matrixDirty[1] = false;
-	}
+    if (c.matrixDirty[MATRIX_MODE_MODELVIEW_PROJECTION])
+    {
+        d3d11->Map(c.m_projectionMatrix, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped);
+        std::memcpy(mapped.pData, this->MatrixGet(MATRIX_MODE_MODELVIEW_PROJECTION), sizeof(DirectX::XMMATRIX));
+        d3d11->Unmap(c.m_projectionMatrix, 0);
+        c.matrixDirty[MATRIX_MODE_MODELVIEW_PROJECTION] = false;
+    }

-	if (context.matrixDirty[2])
-	{
-		d3d11->Map(context.cbMatrix3, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped);
-		std::memcpy(mapped.pData, this->MatrixGet(2), sizeof(DirectX::XMMATRIX));
-		d3d11->Unmap(context.cbMatrix3, 0);
-		context.matrixDirty[2] = false;
-	}
+    if (c.matrixDirty[MATRIX_MODE_MODELVIEW_TEXTURE])
+    {
+        d3d11->Map(c.m_textureMatrix, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped);
+        std::memcpy(mapped.pData, this->MatrixGet(MATRIX_MODE_MODELVIEW_TEXTURE), sizeof(DirectX::XMMATRIX));
+        d3d11->Unmap(c.m_textureMatrix, 0);
+        c.matrixDirty[MATRIX_MODE_MODELVIEW_TEXTURE] = false;
+    }

-	this->UpdateFogState();
-	this->UpdateViewportState();
-	this->UpdateLightingState();
-	this->UpdateTexGenState();
+    this->UpdateFogState();
+    this->UpdateViewportState();
+    this->UpdateLightingState();
+    this->UpdateTexGenState();

-	d3d11->IASetPrimitiveTopology(m_Topologies[PrimitiveType]);
+    d3d11->IASetPrimitiveTopology(m_Topologies[PrimitiveType]);

-	if (PrimitiveType == C4JRender::PRIMITIVE_TYPE_QUAD_LIST)
-	{
-		d3d11->IASetIndexBuffer(quadIndexBuffer, DXGI_FORMAT_R16_UINT, 0);
-		*count = (*count * 6) / 4;
-		*indexed = true;
-		return;
-	}
+    if (PrimitiveType == C4JRender::PRIMITIVE_TYPE_QUAD_LIST)
+    {
+        d3d11->IASetIndexBuffer(quadIndexBuffer, DXGI_FORMAT_R16_UINT, 0);
+        *count = (*count * 6) / 4;
+        *indexed = true;
+        return;
+    }

-	if (PrimitiveType == C4JRender::PRIMITIVE_TYPE_TRIANGLE_FAN)
-	{
-		d3d11->IASetIndexBuffer(fanIndexBuffer, DXGI_FORMAT_R16_UINT, 0);
-		*count = (*count - 2) * 3;
-		*indexed = true;
-		return;
-	}
+    if (PrimitiveType == C4JRender::PRIMITIVE_TYPE_TRIANGLE_FAN)
+    {
+        d3d11->IASetIndexBuffer(fanIndexBuffer, DXGI_FORMAT_R16_UINT, 0);
+        *count = (*count - 2) * 3;
+        *indexed = true;
+        return;
+    }

-	d3d11->IASetIndexBuffer(nullptr, DXGI_FORMAT_R16_UINT, 0);
-	*indexed = false;
+    d3d11->IASetIndexBuffer(nullptr, DXGI_FORMAT_R16_UINT, 0);
+    *indexed = false;
 }

-void Renderer::DrawVertices(
-	C4JRender::ePrimitiveType PrimitiveType,
-	int count,
-	void* vertices,
-	C4JRender::eVertexType vType,
-	C4JRender::ePixelShaderType psType)
+void Renderer::DrawVertices(C4JRender::ePrimitiveType PrimitiveType, int count, void *vertices, C4JRender::eVertexType vType,
+                            C4JRender::ePixelShaderType psType)
 {
-	Renderer::Context& context = this->getContext();
-	ID3D11DeviceContext* d3d11 = context.m_pDeviceContext;
-	Renderer::CommandBuffer* commandBuffer = context.commandBuffer;
+    Renderer::Context &c = this->getContext();
+    ID3D11DeviceContext *d3d11 = c.m_pDeviceContext;
+    Renderer::CommandBuffer *commandBuffer = c.commandBuffer;

-	if (commandBuffer != nullptr)
-	{
-		C4JRender::eVertexType effectiveVertexType = vType;
-		if (effectiveVertexType == C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 && context.lightingEnabled)
-		{
-			effectiveVertexType = C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_LIT;
-		}
+    if (commandBuffer != nullptr)
+    {
+        C4JRender::eVertexType effectiveVertexType = vType;
+        if (effectiveVertexType == C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 && c.lightingEnabled)
+        {
+            effectiveVertexType = C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_LIT;
+        }

-		context.recordingPrimitiveType = PrimitiveType;
-		context.recordingVertexType = effectiveVertexType;
-		const UINT stride = vertexStrideTable[effectiveVertexType];
-		commandBuffer->AddVertices(stride, static_cast<UINT>(count), vertices, context);
-		return;
-	}
+        c.recordingPrimitiveType = PrimitiveType;
+        c.recordingVertexType = effectiveVertexType;
+        const UINT stride = vertexStrideTable[effectiveVertexType];
+        commandBuffer->AddVertices(stride, static_cast<UINT>(count), vertices, c);
+        return;
+    }

-	int drawCount = count;
-	bool indexed = false;
-	this->DrawVertexSetup(vType, psType, PrimitiveType, &drawCount, &indexed);
+    int drawCount = count;
+    bool indexed = false;
+    this->DrawVertexSetup(vType, psType, PrimitiveType, &drawCount, &indexed);

-	const UINT stride = vertexStrideTable[vType];
-	const UINT copySize = stride * static_cast<UINT>(count);
-	if (context.dynamicVertexOffset + copySize > 0x100000u)
-	{
-		context.dynamicVertexOffset = 0;
-	}
+    const UINT stride = vertexStrideTable[vType];
+    const UINT vertexBytes = stride * static_cast<UINT>(count);

-	D3D11_MAPPED_SUBRESOURCE mapped = {};
-	const D3D11_MAP mapType = context.dynamicVertexOffset == 0 ? D3D11_MAP_WRITE_DISCARD : D3D11_MAP_WRITE_NO_OVERWRITE;
-	const HRESULT hr = d3d11->Map(context.dynamicVertexBuffer, 0, mapType, 0, &mapped);
-	if (hr != 0)
-	{
-		std::printf("ERROR: 0x%x\n", static_cast<unsigned int>(hr));
-	}
+    assert(vertexBytes <= Context::VERTEX_BUFFER_SIZE);

-	std::memcpy(static_cast<std::uint8_t*>(mapped.pData) + context.dynamicVertexOffset, vertices, copySize);
-	d3d11->Unmap(context.dynamicVertexBuffer, 0);
+    if (c.dynamicVertexOffset + vertexBytes > Context::VERTEX_BUFFER_SIZE)
+    {
+        c.dynamicVertexOffset = 0;
+    }

-	this->StateUpdate();
+    D3D11_MAPPED_SUBRESOURCE mapped = {};
+    const D3D11_MAP mapType = c.dynamicVertexOffset == 0 ? D3D11_MAP_WRITE_DISCARD : D3D11_MAP_WRITE_NO_OVERWRITE;
+    const HRESULT hr = d3d11->Map(c.dynamicVertexBuffer, 0, mapType, 0, &mapped);
+    if (hr != 0)
+    {
+        std::printf("ERROR: 0x%x\n", static_cast<unsigned int>(hr));
+    }

-	ID3D11Buffer* dynamicBuffer = context.dynamicVertexBuffer;
-	const UINT vertexOffset = context.dynamicVertexOffset;
-	d3d11->IASetVertexBuffers(0, 1, &dynamicBuffer, &stride, &vertexOffset);
+    std::memcpy(static_cast<std::uint8_t *>(mapped.pData) + c.dynamicVertexOffset, vertices, vertexBytes);
+    d3d11->Unmap(c.dynamicVertexBuffer, 0);

-	if (indexed)
-	{
-		d3d11->DrawIndexed(drawCount, 0, 0);
-	}
-	else
-	{
-		d3d11->Draw(count, 0);
-	}
+    this->StateUpdate();

-	context.dynamicVertexOffset += copySize;
+    ID3D11Buffer *dynamicBuffer = c.dynamicVertexBuffer;
+    const UINT vertexOffset = c.dynamicVertexOffset;
+    d3d11->IASetVertexBuffers(0, 1, &dynamicBuffer, &stride, &vertexOffset);
+
+    if (indexed)
+    {
+        d3d11->DrawIndexed(drawCount, 0, 0);
+    }
+    else
+    {
+        d3d11->Draw(count, 0);
+    }
+
+    c.dynamicVertexOffset += vertexBytes;
 }
@@ -37,7 +37,7 @@ void main(

 */

-static unsigned char VS_Compressed_Data[] =
+static unsigned char g_main_VS_Compressed[] =
 {
  0x44, 0x58, 0x42, 0x43, 0x1F, 0x76, 0x17, 0xC2, 0xF2, 0x5A,
  0x47, 0x81, 0x55, 0xD3, 0x6E, 0xD1, 0x0A, 0xB0, 0xBF, 0x4A,
@@ -35,7 +35,7 @@ void main(

 */

-static unsigned char VS_PF3_TF2_CB4_NB4_XW1_Data[] =
+static unsigned char g_main_VS_PF3_TF2_CB4_NB4_XW1[] =
 {
  0x44, 0x58, 0x42, 0x43, 0x83, 0x66, 0x28, 0xAB, 0x3F, 0xFA,
  0xEB, 0x49, 0x6F, 0xE0, 0x81, 0x37, 0x2A, 0x0E, 0x62, 0x6E,
@@ -43,7 +43,7 @@ void main(

 */

-static unsigned char VS_PF3_TF2_CB4_NB4_XW1_Lighting_Data[] =
+static unsigned char g_main_VS_PF3_TF2_CB4_NB4_XW1_LIGHTING[] =
 {
  0x44, 0x58, 0x42, 0x43, 0x94, 0x85, 0x62, 0xA8, 0x82, 0x54,
  0xB8, 0xE6, 0x16, 0x24, 0x6D, 0x3A, 0xB4, 0x0D, 0x4A, 0x7C,
@@ -36,7 +36,7 @@ void main(

 */

-static unsigned char VS_PF3_TF2_CB4_NB4_XW1_Texgen_Data[] =
+static unsigned char g_main_VS_PF3_TF2_CB4_NB4_XW1_TEXGEN[] =
 {
  0x44, 0x58, 0x42, 0x43, 0xD7, 0x13, 0x1B, 0xCA, 0xDF, 0xE8,
  0xA9, 0xCC, 0xDA, 0x19, 0x1B, 0x6D, 0x0C, 0x53, 0xED, 0xEE,
@@ -13,7 +13,7 @@ void main(
 }

 */
-static unsigned char VS_ScreenClear_Data[] =
+static unsigned char g_main_VS_ScreenClear[] =
 {
  0x44, 0x58, 0x42, 0x43, 0xFB, 0x82, 0xC7, 0xF7, 0x5E, 0x97,
  0x42, 0x30, 0xDA, 0xAE, 0x62, 0x79, 0x54, 0x21, 0x37, 0xA2,
@@ -21,7 +21,7 @@ void main(

 */

-static unsigned char VS_ScreenSpace_Data[] =
+static unsigned char g_main_VS_ScreenSpace[] =
 {
  0x44, 0x58, 0x42, 0x43, 0xB6, 0x90, 0x0F, 0x5D, 0x1E, 0x08,
  0xBC, 0x0E, 0xCD, 0x1F, 0xED, 0xD0, 0xAE, 0x45, 0x7E, 0xDA,
@@ -5,280 +5,284 @@
 C4JStorage StorageManager;
 XMARKETPLACE_CONTENTOFFER_INFO InternalContentOfferInfo;

-C4JStorage::C4JStorage()
-{
-
-}
+C4JStorage::C4JStorage() {}

 void C4JStorage::Tick(void)
 {
-	InternalStorageManager.Tick();
+    InternalStorageManager.Tick();
 }

-C4JStorage::EMessageResult C4JStorage::RequestMessageBox(UINT uiTitle, UINT uiText, UINT* uiOptionA, UINT uiOptionC, DWORD dwPad,
-	int(*Func)(LPVOID, int, const C4JStorage::EMessageResult), LPVOID lpParam, C4JStringTable* pStringTable, WCHAR* pwchFormatString, DWORD dwFocusButton)
+C4JStorage::EMessageResult C4JStorage::RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA, UINT uiOptionC, DWORD dwPad,
+                                                         int (*Func)(LPVOID, int, const C4JStorage::EMessageResult), LPVOID lpParam,
+                                                         C4JStringTable *pStringTable, WCHAR *pwchFormatString, DWORD dwFocusButton)
 {
-	return EMessage_Undefined;
+    return EMessage_Undefined;
 }

 C4JStorage::EMessageResult C4JStorage::GetMessageBoxResult()
 {
-	return EMessage_Undefined;
+    return EMessage_Undefined;
 }

-bool C4JStorage::SetSaveDevice(int(*Func)(LPVOID, const bool), LPVOID lpParam, bool bForceResetOfSaveDevice)
+bool C4JStorage::SetSaveDevice(int (*Func)(LPVOID, const bool), LPVOID lpParam, bool bForceResetOfSaveDevice)
 {
-	return true;
+    return true;
 }

-void C4JStorage::Init(unsigned int uiSaveVersion, LPCWSTR pwchDefaultSaveName, char* pszSavePackName, int iMinimumSaveSize, int(*Func)(LPVOID, const ESavingMessage, int), LPVOID lpParam, LPCSTR szGroupID)
+void C4JStorage::Init(unsigned int uiSaveVersion, LPCWSTR pwchDefaultSaveName, char *pszSavePackName, int iMinimumSaveSize,
+                      int (*Func)(LPVOID, const ESavingMessage, int), LPVOID lpParam, LPCSTR szGroupID)
 {
-	InternalStorageManager.Init(Func, lpParam, szGroupID);
+    InternalStorageManager.Init(Func, lpParam, szGroupID);
 }

 void C4JStorage::ResetSaveData()
 {
-	InternalStorageManager.m_SaveGame.ResetSaveData();
+    InternalStorageManager.m_SaveGame.ResetSaveData();
 }

 void C4JStorage::SetDefaultSaveNameForKeyboardDisplay(LPCWSTR pwchDefaultSaveName)
 {
-	;
+    ;
 }

 void C4JStorage::SetSaveTitle(LPCWSTR pwchDefaultSaveName)
 {
-	InternalStorageManager.m_SaveGame.SetSaveTitle(pwchDefaultSaveName);
+    InternalStorageManager.m_SaveGame.SetSaveTitle(pwchDefaultSaveName);
 }

-bool C4JStorage::GetSaveUniqueNumber(INT* piVal)
+bool C4JStorage::GetSaveUniqueNumber(INT *piVal)
 {
-	return InternalStorageManager.m_SaveGame.GetSaveUniqueNumber(piVal);
+    return InternalStorageManager.m_SaveGame.GetSaveUniqueNumber(piVal);
 }

-bool C4JStorage::GetSaveUniqueFilename(char* pszName)
+bool C4JStorage::GetSaveUniqueFilename(char *pszName)
 {
-	return InternalStorageManager.m_SaveGame.GetSaveUniqueFilename(pszName);
+    return InternalStorageManager.m_SaveGame.GetSaveUniqueFilename(pszName);
 }

-void C4JStorage::SetSaveUniqueFilename(char* szFilename)
+void C4JStorage::SetSaveUniqueFilename(char *szFilename)
 {
-	InternalStorageManager.m_SaveGame.SetSaveUniqueFilename(szFilename);
+    InternalStorageManager.m_SaveGame.SetSaveUniqueFilename(szFilename);
 }

-void C4JStorage::SetState(ESaveGameControlState eControlState, int(*Func)(LPVOID, const bool), LPVOID lpParam)
+void C4JStorage::SetState(ESaveGameControlState eControlState, int (*Func)(LPVOID, const bool), LPVOID lpParam)
 {
-	;
+    ;
 }

 void C4JStorage::SetSaveDisabled(bool bDisable)
 {
-	InternalStorageManager.m_SaveGame.SetSaveDisabled(bDisable);
+    InternalStorageManager.m_SaveGame.SetSaveDisabled(bDisable);
 }

 bool C4JStorage::GetSaveDisabled(void)
 {
-	return InternalStorageManager.m_SaveGame.GetSaveDisabled();
+    return InternalStorageManager.m_SaveGame.GetSaveDisabled();
 }

 unsigned int C4JStorage::GetSaveSize()
 {
-	return InternalStorageManager.m_SaveGame.GetSaveSize();
+    return InternalStorageManager.m_SaveGame.GetSaveSize();
 }

-void C4JStorage::GetSaveData(void* pvData, unsigned int* puiBytes)
+void C4JStorage::GetSaveData(void *pvData, unsigned int *puiBytes)
 {
-	InternalStorageManager.m_SaveGame.GetSaveData(pvData, puiBytes);
+    InternalStorageManager.m_SaveGame.GetSaveData(pvData, puiBytes);
 }

 PVOID C4JStorage::AllocateSaveData(unsigned int uiBytes)
 {
-	return InternalStorageManager.m_SaveGame.AllocateSaveData(uiBytes);
+    return InternalStorageManager.m_SaveGame.AllocateSaveData(uiBytes);
 }

 void C4JStorage::SetSaveImages(PBYTE pbThumbnail, DWORD dwThumbnailBytes, PBYTE pbImage, DWORD dwImageBytes, PBYTE pbTextData, DWORD dwTextDataBytes)
 {
-	InternalStorageManager.m_SaveGame.SetSaveImages(pbThumbnail, dwThumbnailBytes, pbImage, dwImageBytes, pbTextData, dwTextDataBytes);
+    InternalStorageManager.m_SaveGame.SetSaveImages(pbThumbnail, dwThumbnailBytes, pbImage, dwImageBytes, pbTextData, dwTextDataBytes);
 }

-C4JStorage::ESaveGameState C4JStorage::SaveSaveData(int(*Func)(LPVOID, const bool), LPVOID lpParam)
+C4JStorage::ESaveGameState C4JStorage::SaveSaveData(int (*Func)(LPVOID, const bool), LPVOID lpParam)
 {
-	return InternalStorageManager.m_SaveGame.SaveSaveData(Func, lpParam);
+    return InternalStorageManager.m_SaveGame.SaveSaveData(Func, lpParam);
 }

-void C4JStorage::CopySaveDataToNewSave(PBYTE pbThumbnail, DWORD cbThumbnail, WCHAR* wchNewName, int (*Func)(LPVOID lpParam, bool), LPVOID lpParam)
+void C4JStorage::CopySaveDataToNewSave(PBYTE pbThumbnail, DWORD cbThumbnail, WCHAR *wchNewName, int (*Func)(LPVOID lpParam, bool), LPVOID lpParam)
 {
-	;
+    ;
 }

 void C4JStorage::SetSaveDeviceSelected(unsigned int uiPad, bool bSelected)
 {
-	;
+    ;
 }

 bool C4JStorage::GetSaveDeviceSelected(unsigned int iPad)
 {
-	return true;
+    return true;
 }

-C4JStorage::ESaveGameState C4JStorage::DoesSaveExist(bool* pbExists)
+C4JStorage::ESaveGameState C4JStorage::DoesSaveExist(bool *pbExists)
 {
-	*pbExists = true;
-	return ESaveGame_Idle;
+    *pbExists = true;
+    return ESaveGame_Idle;
 }

 bool C4JStorage::EnoughSpaceForAMinSaveGame()
 {
-	return true;
+    return true;
 }

 void C4JStorage::SetSaveMessageVPosition(float fY)
 {
-	;
+    ;
 }

-C4JStorage::ESaveGameState C4JStorage::GetSavesInfo(int iPad, int (*Func)(LPVOID lpParam, SAVE_DETAILS* pSaveDetails, const bool), LPVOID lpParam, char* pszSavePackName)
+C4JStorage::ESaveGameState C4JStorage::GetSavesInfo(int iPad, int (*Func)(LPVOID lpParam, SAVE_DETAILS *pSaveDetails, const bool), LPVOID lpParam,
+                                                    char *pszSavePackName)
 {
-	return InternalStorageManager.m_SaveGame.GetSavesInfo(iPad, Func, lpParam, pszSavePackName);
+    return InternalStorageManager.m_SaveGame.GetSavesInfo(iPad, Func, lpParam, pszSavePackName);
 }

 PSAVE_DETAILS C4JStorage::ReturnSavesInfo()
 {
-	return InternalStorageManager.m_SaveGame.ReturnSavesInfo();
+    return InternalStorageManager.m_SaveGame.ReturnSavesInfo();
 }

 void C4JStorage::ClearSavesInfo()
 {
-	InternalStorageManager.m_SaveGame.ClearSavesInfo();
+    InternalStorageManager.m_SaveGame.ClearSavesInfo();
 }

-C4JStorage::ESaveGameState C4JStorage::LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, PBYTE pbThumbnail, DWORD dwThumbnailBytes), LPVOID lpParam)
+C4JStorage::ESaveGameState C4JStorage::LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo,
+                                                             int (*Func)(LPVOID lpParam, PBYTE pbThumbnail, DWORD dwThumbnailBytes), LPVOID lpParam)
 {
-	return InternalStorageManager.m_SaveGame.LoadSaveDataThumbnail(pSaveInfo, Func, lpParam);
+    return InternalStorageManager.m_SaveGame.LoadSaveDataThumbnail(pSaveInfo, Func, lpParam);
 }

-void C4JStorage::GetSaveCacheFileInfo(DWORD dwFile, XCONTENT_DATA& xContentData)
+void C4JStorage::GetSaveCacheFileInfo(DWORD dwFile, XCONTENT_DATA &xContentData)
 {
-	;
+    ;
 }

-void C4JStorage::GetSaveCacheFileInfo(DWORD dwFile, PBYTE* ppbImageData, DWORD* pdwImageBytes)
+void C4JStorage::GetSaveCacheFileInfo(DWORD dwFile, PBYTE *ppbImageData, DWORD *pdwImageBytes)
 {
-	;
+    ;
 }

-C4JStorage::ESaveGameState C4JStorage::LoadSaveData(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, const bool, const bool), LPVOID lpParam)
+C4JStorage::ESaveGameState C4JStorage::LoadSaveData(PSAVE_INFO pSaveInfo, int (*Func)(LPVOID lpParam, const bool, const bool), LPVOID lpParam)
 {
-	return InternalStorageManager.m_SaveGame.LoadSaveData(pSaveInfo, Func, lpParam);
+    return InternalStorageManager.m_SaveGame.LoadSaveData(pSaveInfo, Func, lpParam);
 }

-C4JStorage::ESaveGameState C4JStorage::DeleteSaveData(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, const bool), LPVOID lpParam)
+C4JStorage::ESaveGameState C4JStorage::DeleteSaveData(PSAVE_INFO pSaveInfo, int (*Func)(LPVOID lpParam, const bool), LPVOID lpParam)
 {
-	return InternalStorageManager.m_SaveGame.DeleteSaveData(pSaveInfo, Func, lpParam);
+    return InternalStorageManager.m_SaveGame.DeleteSaveData(pSaveInfo, Func, lpParam);
 }

-void C4JStorage::RegisterMarketplaceCountsCallback(int (*Func)(LPVOID lpParam, C4JStorage::DLC_TMS_DETAILS*, int), LPVOID lpParam)
+void C4JStorage::RegisterMarketplaceCountsCallback(int (*Func)(LPVOID lpParam, C4JStorage::DLC_TMS_DETAILS *, int), LPVOID lpParam)
 {
-	;
+    ;
 }

-void C4JStorage::SetDLCPackageRoot(char* pszDLCRoot)
+void C4JStorage::SetDLCPackageRoot(char *pszDLCRoot)
 {
-	InternalStorageManager.m_DLC.SetPackageRoot(pszDLCRoot);
+    InternalStorageManager.m_DLC.SetPackageRoot(pszDLCRoot);
 }

-C4JStorage::EDLCStatus C4JStorage::GetDLCOffers(int iPad, int(*Func)(LPVOID, int, DWORD, int), LPVOID lpParam, DWORD dwOfferTypesBitmask)
+C4JStorage::EDLCStatus C4JStorage::GetDLCOffers(int iPad, int (*Func)(LPVOID, int, DWORD, int), LPVOID lpParam, DWORD dwOfferTypesBitmask)
 {
-	return EDLC_Idle;
+    return EDLC_Idle;
 }

 DWORD C4JStorage::CancelGetDLCOffers()
 {
-	return 0;
+    return 0;
 }

 void C4JStorage::ClearDLCOffers()
 {
-	;
+    ;
 }

-XMARKETPLACE_CONTENTOFFER_INFO& C4JStorage::GetOffer(DWORD dw)
+XMARKETPLACE_CONTENTOFFER_INFO &C4JStorage::GetOffer(DWORD dw)
 {
-	return InternalContentOfferInfo;
+    return InternalContentOfferInfo;
 }

 int C4JStorage::GetOfferCount()
 {
-	return 0;
+    return 0;
 }

-DWORD C4JStorage::InstallOffer(int iOfferIDC, __uint64* ullOfferIDA, int(*Func)(LPVOID, int, int), LPVOID lpParam, bool bTrial)
+DWORD C4JStorage::InstallOffer(int iOfferIDC, __uint64 *ullOfferIDA, int (*Func)(LPVOID, int, int), LPVOID lpParam, bool bTrial)
 {
-	return 0;
+    return 0;
 }

 DWORD C4JStorage::GetAvailableDLCCount(int iPad)
 {
-	return InternalStorageManager.m_DLC.GetAvailableDLCCount(iPad);
+    return InternalStorageManager.m_DLC.GetAvailableDLCCount(iPad);
 }

-C4JStorage::EDLCStatus C4JStorage::GetInstalledDLC(int iPad, int(*Func)(LPVOID, int, int), LPVOID lpParam)
+C4JStorage::EDLCStatus C4JStorage::GetInstalledDLC(int iPad, int (*Func)(LPVOID, int, int), LPVOID lpParam)
 {
-	return InternalStorageManager.m_DLC.GetInstalledDLC(iPad, Func, lpParam);
+    return InternalStorageManager.m_DLC.GetInstalledDLC(iPad, Func, lpParam);
 }

-XCONTENT_DATA& C4JStorage::GetDLC(DWORD dw)
+XCONTENT_DATA &C4JStorage::GetDLC(DWORD dw)
 {
-	return InternalStorageManager.m_DLC.GetDLC(dw);
+    return InternalStorageManager.m_DLC.GetDLC(dw);
 }

-DWORD C4JStorage::MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive)
+DWORD C4JStorage::MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive)
 {
-	return InternalStorageManager.m_DLC.MountInstalledDLC(iPad, dwDLC, Func, lpParam, szMountDrive);
+    return InternalStorageManager.m_DLC.MountInstalledDLC(iPad, dwDLC, Func, lpParam, szMountDrive);
 }

 DWORD C4JStorage::UnmountInstalledDLC(LPCSTR szMountDrive)
 {
-	return InternalStorageManager.m_DLC.UnmountInstalledDLC(szMountDrive);
+    return InternalStorageManager.m_DLC.UnmountInstalledDLC(szMountDrive);
 }

-void C4JStorage::GetMountedDLCFileList(const char* szMountDrive, std::vector<std::string>& fileList)
+void C4JStorage::GetMountedDLCFileList(const char *szMountDrive, std::vector<std::string> &fileList)
 {
-	InternalStorageManager.m_DLC.GetMountedDLCFileList(szMountDrive, fileList);
+    InternalStorageManager.m_DLC.GetMountedDLCFileList(szMountDrive, fileList);
 }

 std::string C4JStorage::GetMountedPath(std::string szMount)
 {
-	return InternalStorageManager.m_DLC.GetMountedPath(szMount);
+    return InternalStorageManager.m_DLC.GetMountedPath(szMount);
 }

 C4JStorage::ETMSStatus C4JStorage::ReadTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, C4JStorage::eTMS_FileType eFileType,
-	WCHAR* pwchFilename, BYTE** ppBuffer, DWORD* pdwBufferSize, int(*Func)(LPVOID, WCHAR*, int, bool, int), LPVOID lpParam, int iAction)
+                                               WCHAR *pwchFilename, BYTE **ppBuffer, DWORD *pdwBufferSize,
+                                               int (*Func)(LPVOID, WCHAR *, int, bool, int), LPVOID lpParam, int iAction)
 {
-	return ETMSStatus_Idle;
+    return ETMSStatus_Idle;
 }

-bool C4JStorage::WriteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, WCHAR* pwchFilename, BYTE* pBuffer, DWORD dwBufferSize)
+bool C4JStorage::WriteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, WCHAR *pwchFilename, BYTE *pBuffer, DWORD dwBufferSize)
 {
-	return true;
+    return true;
 }

-bool C4JStorage::DeleteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, WCHAR* pwchFilename)
+bool C4JStorage::DeleteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, WCHAR *pwchFilename)
 {
-	return true;
+    return true;
 }

-void C4JStorage::StoreTMSPathName(WCHAR* pwchName)
+void C4JStorage::StoreTMSPathName(WCHAR *pwchName)
 {
-	;
+    ;
 }

-C4JStorage::ETMSStatus C4JStorage::TMSPP_ReadFile(int iPad, C4JStorage::eGlobalStorage eStorageFacility, C4JStorage::eTMS_FILETYPEVAL eFileTypeVal, LPCSTR szFilename, int(*Func)(LPVOID, int, int, PTMSPP_FILEDATA, LPCSTR), LPVOID lpParam, int iUserData)
+C4JStorage::ETMSStatus C4JStorage::TMSPP_ReadFile(int iPad, C4JStorage::eGlobalStorage eStorageFacility, C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,
+                                                  LPCSTR szFilename, int (*Func)(LPVOID, int, int, PTMSPP_FILEDATA, LPCSTR), LPVOID lpParam,
+                                                  int iUserData)
 {
-	return ETMSStatus_Idle;
+    return ETMSStatus_Idle;
 }

-unsigned int C4JStorage::CRC(unsigned char* buf, int len)
+unsigned int C4JStorage::CRC(unsigned char *buf, int len)
 {
-	return 0;
+    return 0;
 }
@@ -2,33 +2,33 @@
 #include "STO_DLC.h"
 #include "STO_Main.h"

-XCONTENT_DATA& CDLC::GetDLC(DWORD dw)
+XCONTENT_DATA &CDLC::GetDLC(DWORD dw)
 {
-	return m_vInstalledDLCs[dw];
+    return m_vInstalledDLCs[dw];
 }

 CDLC::CDLC(void) : m_vInstalledDLCs(), m_szMountPath(), m_vDLCDriveMappings()
 {
-	m_iHasNewInstalledDLCs = false;
-	dword0 = 0;
-	dwordC0 = 0;
-	m_iHasNewMountedDLCs = false; // @Patoke fix
+    m_iHasNewInstalledDLCs = false;
+    dword0 = 0;
+    dwordC0 = 0;
+    m_iHasNewMountedDLCs = false; // @Patoke fix

-	ZeroMemory(m_szDLCProductCode, sizeof(m_szDLCProductCode));
-	ZeroMemory(m_szProductUpgradeKey, sizeof(m_szProductUpgradeKey));
+    ZeroMemory(m_szDLCProductCode, sizeof(m_szDLCProductCode));
+    ZeroMemory(m_szProductUpgradeKey, sizeof(m_szProductUpgradeKey));
 }

-C4JStorage::EDLCStatus CDLC::GetOffers(int iPad, int(*Func)(LPVOID, int, DWORD, int), LPVOID lpParam, DWORD dwOfferTypesBitmask)
+C4JStorage::EDLCStatus CDLC::GetOffers(int iPad, int (*Func)(LPVOID, int, DWORD, int), LPVOID lpParam, DWORD dwOfferTypesBitmask)
 {
-	return C4JStorage::EDLC_NoOffers;
+    return C4JStorage::EDLC_NoOffers;
 }

 void CDLC::ClearOffers()
 {
-	;
+    ;
 }

-C4JStorage::EDLCStatus CDLC::GetInstalledDLC(int iPad, int(*Func)(LPVOID, int, int), LPVOID lpParam)
+C4JStorage::EDLCStatus CDLC::GetInstalledDLC(int iPad, int (*Func)(LPVOID, int, int), LPVOID lpParam)
 {
    if (m_iHasNewInstalledDLCs)
    {
@@ -37,7 +37,7 @@ C4JStorage::EDLCStatus CDLC::GetInstalledDLC(int iPad, int(*Func)(LPVOID, int, i

    m_pInstalledDLCFunc = Func;
    m_pInstalledDLCParam = lpParam;
-	m_iHasNewInstalledDLCs = true;
+    m_iHasNewInstalledDLCs = true;

    bool ret = false;
    DWORD atts = GetFileAttributesA("Windows64Media/DLC");
@@ -54,196 +54,195 @@ C4JStorage::EDLCStatus CDLC::GetInstalledDLC(int iPad, int(*Func)(LPVOID, int, i
        return C4JStorage::EDLC_Error;
    }

-	_WIN32_FIND_DATAA hFind;
-	HANDLE hFindFile;
-	if (ret)
-	{
-		hFindFile = FindFirstFileA("Windows64/DLC/*", &hFind);
-	}
-	else
-	{
-		hFindFile = FindFirstFileA("Windows64Media/DLC/*", &hFind);
-	}
+    _WIN32_FIND_DATAA hFind;
+    HANDLE hFindFile;
+    if (ret)
+    {
+        hFindFile = FindFirstFileA("Windows64/DLC/*", &hFind);
+    }
+    else
+    {
+        hFindFile = FindFirstFileA("Windows64Media/DLC/*", &hFind);
+    }

-	if (hFindFile != (HANDLE)-1LL)
-	{
-		do
-		{
-			atts = hFind.dwFileAttributes;
+    if (hFindFile != (HANDLE)-1LL)
+    {
+        do
+        {
+            atts = hFind.dwFileAttributes;

-			bool isArt = hFind.dwFileAttributes != -1 && (hFind.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-			if (isArt && hFind.cFileName[0] != '.')
-			{
-				XCONTENT_DATA data;
+            bool isArt = hFind.dwFileAttributes != -1 && (hFind.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
+            if (isArt && hFind.cFileName[0] != '.')
+            {
+                XCONTENT_DATA data;

-				if (ret)
-				{
-					sprintf(data.szFileName, "Windows64/DLC/%s", hFind.cFileName);
-				}
-				else
-				{
-					sprintf(data.szFileName, "Windows64Media/DLC/%s", hFind.cFileName);
-				}
+                if (ret)
+                {
+                    sprintf(data.szFileName, "Windows64/DLC/%s", hFind.cFileName);
+                }
+                else
+                {
+                    sprintf(data.szFileName, "Windows64Media/DLC/%s", hFind.cFileName);
+                }

-				swprintf(data.szDisplayName, 256, L"%s", hFind.cFileName);
-				int displayNameLen = wcslen(data.szDisplayName);
+                swprintf(data.szDisplayName, 256, L"%s", hFind.cFileName);
+                int displayNameLen = wcslen(data.szDisplayName);

-				data.DeviceID = 0;
-				data.dwContentType = 0;
+                data.DeviceID = 0;
+                data.dwContentType = 0;

-				AddInstalled(&data);
-			}
-		} while (FindNextFileA(hFindFile, &hFind));
-		FindClose(hFindFile);
-	}
+                AddInstalled(&data);
+            }
+        } while (FindNextFileA(hFindFile, &hFind));
+        FindClose(hFindFile);
+    }

-	return C4JStorage::EDLC_Idle;
+    return C4JStorage::EDLC_Idle;
 }

-DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive)
+DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive)
 {
-	this->m_pMountedDLCFunc = Func;
-	this->m_pMountedDLCParam = lpParam;
+    this->m_pMountedDLCFunc = Func;
+    this->m_pMountedDLCParam = lpParam;

-	if (szMountDrive)
-	{
-		m_szMountPath = szMountDrive;
-	}
-	else
-	{
-		m_szMountPath = this->m_szPackageRoot;
-	}
+    if (szMountDrive)
+    {
+        m_szMountPath = szMountDrive;
+    }
+    else
+    {
+        m_szMountPath = this->m_szPackageRoot;
+    }

-	this->m_uiCurrentMappedDLC = dwDLC;
+    this->m_uiCurrentMappedDLC = dwDLC;

-	char* dlcdirPath = m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName;
-	m_vDLCDriveMappings.push_back(DriveMapping(dlcdirPath, m_szMountPath));
+    char *dlcdirPath = m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName;
+    m_vDLCDriveMappings.push_back(DriveMapping(dlcdirPath, m_szMountPath));

-	m_iHasNewMountedDLCs = true;
+    m_iHasNewMountedDLCs = true;

-	return 997;
+    return 997;
 }

 DWORD CDLC::UnmountInstalledDLC(LPCSTR szMountDrive)
 {
-	LPCSTR szDrive = nullptr;
+    LPCSTR szDrive = nullptr;

-	if (szMountDrive)
-	{
-		szDrive = szMountDrive;
-	}
-	else
-	{
-		szDrive = this->m_szPackageRoot;
-	}
+    if (szMountDrive)
+    {
+        szDrive = szMountDrive;
+    }
+    else
+    {
+        szDrive = this->m_szPackageRoot;
+    }

-	for (int i = 0; i < this->m_vDLCDriveMappings.size(); i++)
-	{
-		if (m_vDLCDriveMappings[i].m_szDirectoryPath == szDrive)
-		{
-			m_vDLCDriveMappings.erase(m_vDLCDriveMappings.begin() + i);
+    for (int i = 0; i < this->m_vDLCDriveMappings.size(); i++)
+    {
+        if (m_vDLCDriveMappings[i].m_szDirectoryPath == szDrive)
+        {
+            m_vDLCDriveMappings.erase(m_vDLCDriveMappings.begin() + i);

-			return 0;
-		}
-	}
-	return 0;
+            return 0;
+        }
+    }
+    return 0;
 }

-void CDLC::GetMountedDLCFileList(const char* szMountDrive, std::vector<std::string>& fileList)
+void CDLC::GetMountedDLCFileList(const char *szMountDrive, std::vector<std::string> &fileList)
 {
-	char* dlcdirPath = new char[256];
-	sprintf(dlcdirPath, "%s/*", m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName);
+    char *dlcdirPath = new char[256];
+    sprintf(dlcdirPath, "%s/*", m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName);

-	_WIN32_FIND_DATAA atts;
-	HANDLE hFind = FindFirstFileA(dlcdirPath, &atts);
-	if (hFind != (HANDLE)-1LL)
-	{
-		do
-		{
-			if (atts.dwFileAttributes == -1 || (atts.dwFileAttributes & 0x10) != 0x10)
-			{
-				char dir[256];
-				sprintf(dir, "%s/%s", m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName, atts.cFileName);
+    _WIN32_FIND_DATAA atts;
+    HANDLE hFind = FindFirstFileA(dlcdirPath, &atts);
+    if (hFind != (HANDLE)-1LL)
+    {
+        do
+        {
+            if (atts.dwFileAttributes == -1 || (atts.dwFileAttributes & 0x10) != 0x10)
+            {
+                char dir[256];
+                sprintf(dir, "%s/%s", m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName, atts.cFileName);

-				fileList.push_back(dir);
-			}
-		} while (FindNextFileA(hFind, &atts));
-		FindClose(hFind);
-	}
-	delete[] dlcdirPath;
+                fileList.push_back(dir);
+            }
+        } while (FindNextFileA(hFind, &atts));
+        FindClose(hFind);
+    }
+    delete[] dlcdirPath;
 }

 std::string CDLC::GetMountedPath(std::string szMount)
 {
-	for (int ch = 0; ch < szMount.size(); ++ch)
-	{
-		if (szMount[ch] == '/' || szMount[ch] == '\\')
-		{
-			return "";
-		}
+    for (int ch = 0; ch < szMount.size(); ++ch)
+    {
+        if (szMount[ch] == '/' || szMount[ch] == '\\')
+        {
+            return "";
+        }

-		if (szMount[ch] == ':')
-		{
-			std::string driveName = szMount.substr(0, ch);
-			for (int i = 0; i < m_vDLCDriveMappings.size(); ++i)
-			{
-				if (m_vDLCDriveMappings[i].m_szDirectoryPath == driveName)
-				{
-					std::string newPath = m_vDLCDriveMappings[i].m_szMountPath;
+        if (szMount[ch] == ':')
+        {
+            std::string driveName = szMount.substr(0, ch);
+            for (int i = 0; i < m_vDLCDriveMappings.size(); ++i)
+            {
+                if (m_vDLCDriveMappings[i].m_szDirectoryPath == driveName)
+                {
+                    std::string newPath = m_vDLCDriveMappings[i].m_szMountPath;

-					newPath.append(szMount.substr(ch + 1, -1));
+                    newPath.append(szMount.substr(ch + 1, -1));

-					return newPath;
-				}
-			}
-			break;
-		}
-	}
+                    return newPath;
+                }
+            }
+            break;
+        }
+    }

-	return "";
+    return "";
 }

-
-void CDLC::SetDLCProductCode(const char* szProductCode)
+void CDLC::SetDLCProductCode(const char *szProductCode)
 {
-	strcpy(m_szDLCProductCode, szProductCode);
+    strcpy(m_szDLCProductCode, szProductCode);
 }

-void CDLC::SetProductUpgradeKey(const char* szProductCode)
+void CDLC::SetProductUpgradeKey(const char *szProductCode)
 {
-	strcpy(m_szProductUpgradeKey, szProductCode);
+    strcpy(m_szProductUpgradeKey, szProductCode);
 }

 int CDLC::GetAvailableDLCCount(int iPad)
 {
-	return 0;
+    return 0;
 }

-void CDLC::SetPackageRoot(char* pszDLCRoot)
+void CDLC::SetPackageRoot(char *pszDLCRoot)
 {
-	strcpy(this->m_szPackageRoot, pszDLCRoot);
+    strcpy(this->m_szPackageRoot, pszDLCRoot);
 }

 void CDLC::Tick(void)
 {
-	if (m_iHasNewInstalledDLCs)
-	{
-		m_iHasNewInstalledDLCs = false;
-		m_pInstalledDLCFunc(m_pInstalledDLCParam, m_vInstalledDLCs.size(), 0);
-	}
-	if (m_iHasNewMountedDLCs)
-	{
-		m_iHasNewMountedDLCs = false;
-		m_pMountedDLCFunc(m_pMountedDLCParam, 0, 0, dword94);
-	}
+    if (m_iHasNewInstalledDLCs)
+    {
+        m_iHasNewInstalledDLCs = false;
+        m_pInstalledDLCFunc(m_pInstalledDLCParam, m_vInstalledDLCs.size(), 0);
+    }
+    if (m_iHasNewMountedDLCs)
+    {
+        m_iHasNewMountedDLCs = false;
+        m_pMountedDLCFunc(m_pMountedDLCParam, 0, 0, dword94);
+    }
 }

-void CDLC::AddInstalled(XCONTENT_DATA* data)
+void CDLC::AddInstalled(XCONTENT_DATA *data)
 {
-	m_vInstalledDLCs.push_back(*data);
+    m_vInstalledDLCs.push_back(*data);
 }

 DWORD CDLC::CancelOffers(void)
 {
-	return 0;
+    return 0;
 }
@@ -4,54 +4,54 @@
 class CDLC
 {
 public:
+    struct DriveMapping
+    {
+        DriveMapping(std::string szDirectoryPath, std::string szMountPath) : m_szDirectoryPath(szDirectoryPath), m_szMountPath(szMountPath)
+        {
+            ;
+        }

-	struct DriveMapping
-	{
-		DriveMapping(std::string szDirectoryPath, std::string szMountPath) : m_szDirectoryPath(szDirectoryPath), m_szMountPath(szMountPath)
-		{
-			;
-		}
+        std::string m_szDirectoryPath;
+        std::string m_szMountPath;
+    };

-		std::string m_szDirectoryPath;
-		std::string m_szMountPath;
-	};
+    XCONTENT_DATA &GetDLC(DWORD dw);
+    CDLC(void);

-	XCONTENT_DATA& GetDLC(DWORD dw);
-	CDLC(void);
+    C4JStorage::EDLCStatus GetOffers(int iPad, int (*Func)(LPVOID, int, DWORD, int), LPVOID lpParam,
+                                     DWORD dwOfferTypesBitmask = XMARKETPLACE_OFFERING_TYPE_CONTENT);
+    void ClearOffers();
+    C4JStorage::EDLCStatus GetInstalledDLC(int iPad, int (*Func)(LPVOID, int, int), LPVOID lpParam);
+    DWORD MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive = NULL);
+    DWORD UnmountInstalledDLC(LPCSTR szMountDrive = NULL);
+    void GetMountedDLCFileList(const char *szMountDrive, std::vector<std::string> &fileList);
+    std::string GetMountedPath(std::string szMount);

-	C4JStorage::EDLCStatus				GetOffers(int iPad, int(*Func)(LPVOID, int, DWORD, int), LPVOID lpParam, DWORD dwOfferTypesBitmask = XMARKETPLACE_OFFERING_TYPE_CONTENT);
-	void								ClearOffers();
-	C4JStorage::EDLCStatus				GetInstalledDLC(int iPad, int(*Func)(LPVOID, int, int), LPVOID lpParam);
-	DWORD								MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive = NULL);
-	DWORD								UnmountInstalledDLC(LPCSTR szMountDrive = NULL);
-	void								GetMountedDLCFileList(const char* szMountDrive, std::vector<std::string>& fileList);
-	std::string							GetMountedPath(std::string szMount);
+    void SetDLCProductCode(const char *szProductCode);
+    void SetProductUpgradeKey(const char *szProductCode);
+    int GetAvailableDLCCount(int iPad);
+    void SetPackageRoot(char *pszDLCRoot);

-	void								SetDLCProductCode(const char* szProductCode);
-	void								SetProductUpgradeKey(const char* szProductCode);
-	int									GetAvailableDLCCount(int iPad);
-	void								SetPackageRoot(char* pszDLCRoot);
+    void Tick(void);
+    void AddInstalled(XCONTENT_DATA *data);
+    DWORD CancelOffers(void);

-	void								Tick(void);
-	void								AddInstalled(XCONTENT_DATA* data);
-	DWORD								CancelOffers(void);
-
-	DWORD dword0;
-	int (*m_pInstalledDLCFunc)(LPVOID, int, int);
-	LPVOID m_pInstalledDLCParam;
-	BYTE gap18[16];
-	int m_iHasNewInstalledDLCs;
-	std::vector<XCONTENT_DATA> m_vInstalledDLCs;
-	BYTE gap48[4];
-	DWORD m_iHasNewMountedDLCs;
-	int (*m_pMountedDLCFunc)(LPVOID, int, DWORD, DWORD);
-	LPVOID m_pMountedDLCParam;
-	std::string m_szMountPath;
-	DWORD m_uiCurrentMappedDLC;
-	DWORD dword94;
-	char m_szPackageRoot[40];
-	DWORD dwordC0;
-	std::vector<DriveMapping> m_vDLCDriveMappings;
-	char m_szDLCProductCode[16];
-	char m_szProductUpgradeKey[60];
+    DWORD dword0;
+    int (*m_pInstalledDLCFunc)(LPVOID, int, int);
+    LPVOID m_pInstalledDLCParam;
+    BYTE gap18[16];
+    int m_iHasNewInstalledDLCs;
+    std::vector<XCONTENT_DATA> m_vInstalledDLCs;
+    BYTE gap48[4];
+    DWORD m_iHasNewMountedDLCs;
+    int (*m_pMountedDLCFunc)(LPVOID, int, DWORD, DWORD);
+    LPVOID m_pMountedDLCParam;
+    std::string m_szMountPath;
+    DWORD m_uiCurrentMappedDLC;
+    DWORD dword94;
+    char m_szPackageRoot[40];
+    DWORD dwordC0;
+    std::vector<DriveMapping> m_vDLCDriveMappings;
+    char m_szDLCProductCode[16];
+    char m_szProductUpgradeKey[60];
 };
@@ -10,17 +10,14 @@ CStorage::CStorage(void)
    m_DLC = CDLC();
 }

-void CStorage::Init(int(*Func)(LPVOID, const C4JStorage::ESavingMessage, int), LPVOID lpParam, LPCSTR szGroupID)
-{
+void CStorage::Init(int (*Func)(LPVOID, const C4JStorage::ESavingMessage, int), LPVOID lpParam, LPCSTR szGroupID) {}

-}
-
-void CStorage::Tick(void) 
+void CStorage::Tick(void)
 {
    m_DLC.Tick();
 }

-unsigned int CStorage::CRC(unsigned char* buf, int len)
+unsigned int CStorage::CRC(unsigned char *buf, int len)
 {
    return ~UpdateCRC(0xFFFFFFFF, buf, len);
 }
@@ -46,7 +43,7 @@ void CStorage::MakeCRCTable(void)
    m_bHasCRCTable = true;
 }

-unsigned int CStorage::UpdateCRC(unsigned int crc, unsigned __int8* buf, int len)
+unsigned int CStorage::UpdateCRC(unsigned int crc, unsigned __int8 *buf, int len)
 {
    if (!m_bHasCRCTable)
    {
@@ -55,13 +52,13 @@ unsigned int CStorage::UpdateCRC(unsigned int crc, unsigned __int8* buf, int len

    for (int c = 0; c < len; ++c)
    {
-		crc = (crc >> 8) ^ m_CRCTable[(unsigned __int8)(buf[c] ^ crc)];
+        crc = (crc >> 8) ^ m_CRCTable[(unsigned __int8)(buf[c] ^ crc)];
    }

    return crc;
 }

-void CStorage::DebugPrintf(const char* szFormat, ...)
+void CStorage::DebugPrintf(const char *szFormat, ...)
 {
    char buf[1024];

@@ -1,26 +1,25 @@
 #pragma once
-#include "STO_SaveGame.h"
 #include "STO_DLC.h"
+#include "STO_SaveGame.h"

 class CStorage
 {
 public:
+    CStorage(void);

-	CStorage(void);
+    void Init(int (*Func)(LPVOID, const C4JStorage::ESavingMessage, int), LPVOID lpParam, LPCSTR szGroupID);
+    void Tick(void);
+    unsigned int CRC(unsigned char *buf, int len);
+    void MakeCRCTable(void);
+    unsigned int UpdateCRC(unsigned int crc, unsigned __int8 *buf, int len);
+    void DebugPrintf(const char *szFormat, ...);

-	void			Init(int(*Func)(LPVOID, const C4JStorage::ESavingMessage, int), LPVOID lpParam, LPCSTR szGroupID);
-	void			Tick(void);
-	unsigned int	CRC(unsigned char* buf, int len);
-	void			MakeCRCTable(void);
-	unsigned int	UpdateCRC(unsigned int crc, unsigned __int8* buf, int len);
-	void			DebugPrintf(const char* szFormat, ...);
-
-	BYTE gap0[8];
-	CSaveGame m_SaveGame;
-	CDLC m_DLC;
-	BYTE gap278[0x10];
-	DWORD m_CRCTable[256];
-	bool m_bHasCRCTable;
+    BYTE gap0[8];
+    CSaveGame m_SaveGame;
+    CDLC m_DLC;
+    BYTE gap278[0x10];
+    DWORD m_CRCTable[256];
+    bool m_bHasCRCTable;
 };

 // Singleton
@@ -3,43 +3,44 @@

 CSaveGame::CSaveGame()
 {
-	m_pSaveData = nullptr;
-	m_uiSaveSize = 0;
-	m_bIsSafeDisabled = false;
+    m_pSaveData = nullptr;
+    m_uiSaveSize = 0;
+    m_bIsSafeDisabled = false;

-	ZeroMemory(m_szSaveUniqueName, sizeof(m_szSaveUniqueName));
-	ZeroMemory(m_szSaveTitle, sizeof(m_szSaveTitle));
+    ZeroMemory(m_szSaveUniqueName, sizeof(m_szSaveUniqueName));
+    ZeroMemory(m_szSaveTitle, sizeof(m_szSaveTitle));

-	m_pSaveDetails = nullptr;
-	m_bHasSaveDetails = false;
+    m_pSaveDetails = nullptr;
+    m_bHasSaveDetails = false;

-	GetCurrentDirectoryA(sizeof(m_szSaveUniqueName), m_szSaveUniqueName);
+    GetCurrentDirectoryA(sizeof(m_szSaveUniqueName), m_szSaveUniqueName);

-	char dirName[256];
-	char curDir[256];
-	GetCurrentDirectoryA(sizeof(dirName), dirName);
-	sprintf(curDir, "%s/Windows64/GameHDD/", dirName);
-	CreateDirectoryA(curDir, 0);
+    char dirName[256];
+    char curDir[256];
+    GetCurrentDirectoryA(sizeof(dirName), dirName);
+    sprintf(curDir, "%s/Windows64/GameHDD/", dirName);
+    CreateDirectoryA(curDir, 0);
 }

 void CSaveGame::SetSaveDisabled(bool bDisable)
 {
-	m_bIsSafeDisabled = bDisable;
+    m_bIsSafeDisabled = bDisable;
 }

 bool CSaveGame::GetSaveDisabled(void)
 {
-	return m_bIsSafeDisabled;
+    return m_bIsSafeDisabled;
 }

 void CSaveGame::ResetSaveData()
 {
-	free(m_pSaveData);
-	m_pSaveData = nullptr;
-	m_uiSaveSize = 0;
+    free(m_pSaveData);
+    m_pSaveData = nullptr;
+    m_uiSaveSize = 0;
 }

-C4JStorage::ESaveGameState CSaveGame::GetSavesInfo(int iPad, int (*Func)(LPVOID lpParam, SAVE_DETAILS* pSaveDetails, const bool), LPVOID lpParam, char* pszSavePackName)
+C4JStorage::ESaveGameState CSaveGame::GetSavesInfo(int iPad, int (*Func)(LPVOID lpParam, SAVE_DETAILS *pSaveDetails, const bool), LPVOID lpParam,
+                                                   char *pszSavePackName)
 {
    WIN32_FIND_DATAA findFileData;
    WIN32_FILE_ATTRIBUTE_DATA fileInfoBuffer;
@@ -90,16 +91,15 @@ C4JStorage::ESaveGameState CSaveGame::GetSavesInfo(int iPad, int (*Func)(LPVOID
        {
            do
            {
-                if ((findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0
-                    && strcmp(findFileData.cFileName, ".")
-                    && strcmp(findFileData.cFileName, ".."))
+                if ((findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0 && strcmp(findFileData.cFileName, ".") &&
+                    strcmp(findFileData.cFileName, ".."))
                {
                    strcpy_s(m_pSaveDetails->SaveInfoA[i].UTF8SaveFilename, findFileData.cFileName);
                    strcpy_s(m_pSaveDetails->SaveInfoA[i].UTF8SaveTitle, findFileData.cFileName);
-                    
-                    char fileName[280]; 
+
+                    char fileName[280];
                    sprintf(fileName, "%s\\Windows64\\GameHDD\\%s\\saveData.ms", dirName, findFileData.cFileName);
-                    
+
                    GetFileAttributesExA(fileName, GetFileExInfoStandard, &fileInfoBuffer);
                    m_pSaveDetails->SaveInfoA[i++].metaData.dataSize = fileInfoBuffer.nFileSizeLow;
                    m_pSaveDetails->iSaveC++;
@@ -142,24 +142,25 @@ void CSaveGame::ClearSavesInfo()
    }
 }

-C4JStorage::ESaveGameState CSaveGame::LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, PBYTE pbThumbnail, DWORD dwThumbnailBytes), LPVOID lpParam)
+C4JStorage::ESaveGameState CSaveGame::LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo,
+                                                            int (*Func)(LPVOID lpParam, PBYTE pbThumbnail, DWORD dwThumbnailBytes), LPVOID lpParam)
 {
-	Func(lpParam, pSaveInfo->thumbnailData, pSaveInfo->metaData.thumbnailSize);
+    Func(lpParam, pSaveInfo->thumbnailData, pSaveInfo->metaData.thumbnailSize);
    return C4JStorage::ESaveGame_GetSaveThumbnail;
 }

-C4JStorage::ESaveGameState CSaveGame::LoadSaveData(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, const bool, const bool), LPVOID lpParam)
+C4JStorage::ESaveGameState CSaveGame::LoadSaveData(PSAVE_INFO pSaveInfo, int (*Func)(LPVOID lpParam, const bool, const bool), LPVOID lpParam)
 {
    SetSaveUniqueFilename(pSaveInfo->UTF8SaveFilename);
-    
+
    if (m_pSaveData)
    {
        free(m_pSaveData);
    }
-    
+
    m_pSaveData = malloc(pSaveInfo->metaData.dataSize);
    m_uiSaveSize = pSaveInfo->metaData.dataSize;
-    
+
    char dirName[256];
    char curDir[256];
    char fileName[280];
@@ -167,7 +168,7 @@ C4JStorage::ESaveGameState CSaveGame::LoadSaveData(PSAVE_INFO pSaveInfo, int(*Fu
    sprintf(dirName, "%s/Windows64/GameHDD/%s", curDir, m_szSaveUniqueName);
    CreateDirectoryA(dirName, 0);
    sprintf(fileName, "%s/saveData.ms", dirName);
-    
+
    HANDLE h = CreateFileA(fileName, GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);

    bool success = false;
@@ -193,7 +194,7 @@ unsigned int CSaveGame::GetSaveSize()
    return m_uiSaveSize;
 }

-void CSaveGame::GetSaveData(void* pvData, unsigned int* puiBytes)
+void CSaveGame::GetSaveData(void *pvData, unsigned int *puiBytes)
 {
    if (pvData)
    {
@@ -206,12 +207,12 @@ void CSaveGame::GetSaveData(void* pvData, unsigned int* puiBytes)
    }
 }

-bool CSaveGame::GetSaveUniqueNumber(INT* piVal)
+bool CSaveGame::GetSaveUniqueNumber(INT *piVal)
 {
    return false;
 }

-bool CSaveGame::GetSaveUniqueFilename(char* pszName)
+bool CSaveGame::GetSaveUniqueFilename(char *pszName)
 {
    return false;
 }
@@ -225,7 +226,7 @@ void CSaveGame::SetSaveTitle(LPCWSTR pwchDefaultSaveName)
 PVOID CSaveGame::AllocateSaveData(unsigned int uiBytes)
 {
    free(m_pSaveData);
-    
+
    m_pSaveData = malloc(uiBytes);
    if (m_pSaveData)
    {
@@ -240,7 +241,7 @@ void CSaveGame::SetSaveImages(PBYTE pbThumbnail, DWORD dwThumbnailBytes, PBYTE p
    ;
 }

-C4JStorage::ESaveGameState CSaveGame::SaveSaveData(int(*Func)(LPVOID, const bool), LPVOID lpParam)
+C4JStorage::ESaveGameState CSaveGame::SaveSaveData(int (*Func)(LPVOID, const bool), LPVOID lpParam)
 {
    char dirName[256];
    char curDir[256];
@@ -255,7 +256,7 @@ C4JStorage::ESaveGameState CSaveGame::SaveSaveData(int(*Func)(LPVOID, const bool
    DWORD bytesWritten = 0;
    BOOL res = WriteFile(h, m_pSaveData, m_uiSaveSize, &bytesWritten, 0);
    _ASSERT(res && bytesWritten == m_uiSaveSize);
-   
+
    CloseHandle(h);

    Func(lpParam, true);
@@ -263,28 +264,21 @@ C4JStorage::ESaveGameState CSaveGame::SaveSaveData(int(*Func)(LPVOID, const bool
    return C4JStorage::ESaveGame_Idle;
 }

-C4JStorage::ESaveGameState CSaveGame::DeleteSaveData(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, const bool), LPVOID lpParam)
+C4JStorage::ESaveGameState CSaveGame::DeleteSaveData(PSAVE_INFO pSaveInfo, int (*Func)(LPVOID lpParam, const bool), LPVOID lpParam)
 {
    return C4JStorage::ESaveGame_Idle;
 }

-void CSaveGame::SetSaveUniqueFilename(char* szFilename)
+void CSaveGame::SetSaveUniqueFilename(char *szFilename)
 {
    strcpy_s(m_szSaveUniqueName, szFilename);
 }

-
 void CSaveGame::CreateSaveUniqueName(void)
 {
    _SYSTEMTIME UTCSysTime;
    GetSystemTime(&UTCSysTime);

-    sprintf_s(m_szSaveUniqueName, sizeof(m_szSaveUniqueName), 
-        "%4d%02d%02d%02d%02d%02d",
-        UTCSysTime.wYear,
-        UTCSysTime.wMonth,
-        UTCSysTime.wDay,
-        UTCSysTime.wHour,
-        UTCSysTime.wMinute,
-        UTCSysTime.wSecond);
+    sprintf_s(m_szSaveUniqueName, sizeof(m_szSaveUniqueName), "%4d%02d%02d%02d%02d%02d", UTCSysTime.wYear, UTCSysTime.wMonth, UTCSysTime.wDay,
+              UTCSysTime.wHour, UTCSysTime.wMinute, UTCSysTime.wSecond);
 }
@@ -4,35 +4,36 @@
 class CSaveGame
 {
 public:
+    CSaveGame();
+    void SetSaveDisabled(bool bDisable);
+    bool GetSaveDisabled(void);

-	CSaveGame();
-	void						SetSaveDisabled(bool bDisable);
-	bool						GetSaveDisabled(void);
+    void ResetSaveData();
+    C4JStorage::ESaveGameState GetSavesInfo(int iPad, int (*Func)(LPVOID lpParam, SAVE_DETAILS *pSaveDetails, const bool), LPVOID lpParam,
+                                            char *pszSavePackName);
+    PSAVE_DETAILS ReturnSavesInfo();
+    void ClearSavesInfo();
+    C4JStorage::ESaveGameState LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo, int (*Func)(LPVOID lpParam, PBYTE pbThumbnail, DWORD dwThumbnailBytes),
+                                                     LPVOID lpParam);
+    C4JStorage::ESaveGameState LoadSaveData(PSAVE_INFO pSaveInfo, int (*Func)(LPVOID lpParam, const bool, const bool), LPVOID lpParam);
+    unsigned int GetSaveSize();
+    void GetSaveData(void *pvData, unsigned int *puiBytes);
+    bool GetSaveUniqueNumber(INT *piVal);
+    bool GetSaveUniqueFilename(char *pszName);
+    void SetSaveTitle(LPCWSTR pwchDefaultSaveName);
+    PVOID AllocateSaveData(unsigned int uiBytes);
+    void SetSaveImages(PBYTE pbThumbnail, DWORD dwThumbnailBytes, PBYTE pbImage, DWORD dwImageBytes, PBYTE pbTextData, DWORD dwTextDataBytes);
+    C4JStorage::ESaveGameState SaveSaveData(int (*Func)(LPVOID, const bool), LPVOID lpParam);
+    C4JStorage::ESaveGameState DeleteSaveData(PSAVE_INFO pSaveInfo, int (*Func)(LPVOID lpParam, const bool), LPVOID lpParam);
+    void SetSaveUniqueFilename(char *szFilename);

-	void						ResetSaveData();
-	C4JStorage::ESaveGameState	GetSavesInfo(int iPad, int (*Func)(LPVOID lpParam, SAVE_DETAILS* pSaveDetails, const bool), LPVOID lpParam, char* pszSavePackName);
-	PSAVE_DETAILS				ReturnSavesInfo();
-	void						ClearSavesInfo();
-	C4JStorage::ESaveGameState	LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, PBYTE pbThumbnail, DWORD dwThumbnailBytes), LPVOID lpParam);
-	C4JStorage::ESaveGameState	LoadSaveData(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, const bool, const bool), LPVOID lpParam);
-	unsigned int				GetSaveSize();
-	void						GetSaveData(void* pvData, unsigned int* puiBytes);
-	bool						GetSaveUniqueNumber(INT* piVal);
-	bool						GetSaveUniqueFilename(char* pszName);
-	void						SetSaveTitle(LPCWSTR pwchDefaultSaveName);
-	PVOID						AllocateSaveData(unsigned int uiBytes);
-	void						SetSaveImages(PBYTE pbThumbnail, DWORD dwThumbnailBytes, PBYTE pbImage, DWORD dwImageBytes, PBYTE pbTextData, DWORD dwTextDataBytes);
-	C4JStorage::ESaveGameState	SaveSaveData(int(*Func)(LPVOID, const bool), LPVOID lpParam);
-	C4JStorage::ESaveGameState	DeleteSaveData(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, const bool), LPVOID lpParam);
-	void						SetSaveUniqueFilename(char* szFilename);
+    void CreateSaveUniqueName(void);

-	void						CreateSaveUniqueName(void);
-
-	void* m_pSaveData;
-	unsigned int m_uiSaveSize;
-	char m_szSaveUniqueName[32];
-	char m_szSaveTitle[256];
-	bool m_bIsSafeDisabled;
-	bool m_bHasSaveDetails;
-	SAVE_DETAILS* m_pSaveDetails;
+    void *m_pSaveData;
+    unsigned int m_uiSaveSize;
+    char m_szSaveUniqueName[32];
+    char m_szSaveTitle[256];
+    bool m_bIsSafeDisabled;
+    bool m_bHasSaveDetails;
+    SAVE_DETAILS *m_pSaveDetails;
 };