Added workaround for Visual Studio inline bug

ccw808 · ccw808 · commit cd5b740f033a · 2018-04-01T21:13:18.000+01:00
diff --git a/Client/game_sa/CAudioEngineSA.cpp b/Client/game_sa/CAudioEngineSA.cpp
@@ -426,6 +426,7 @@ VOID CAudioEngineSA::UpdateAmbientSoundSettings(void)
         MemPut<BYTE>(0x507814, 0x33);            // No gunfire
 }
 
+__declspec(noinline)
 bool _cdecl IsAmbientSoundGeneralEnabled(void)
 {
     if (pGame)
@@ -505,6 +506,7 @@ bool CAudioEngineSA::OnWorldSound(CAESound* pAESound)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // Return false to skip sound
+__declspec(noinline)
 bool _cdecl On_CAESoundManager_RequestNewSound(CAESound* pAESound)
 {
     return g_pAudioSA->OnWorldSound(pAESound);
diff --git a/Client/game_sa/CCameraSA.cpp b/Client/game_sa/CCameraSA.cpp
@@ -568,6 +568,7 @@ void CCameraSA::GetCameraClip(bool &bObjects, bool &bVehicles)
     bVehicles = bCameraClipVehicles;
 }
 
+__declspec(noinline)
 void _cdecl DoCameraCollisionDetectionPokes()
 {
     if (!bCameraClipObjects)
diff --git a/Client/game_sa/CFxSystemSA.cpp b/Client/game_sa/CFxSystemSA.cpp
@@ -123,6 +123,7 @@ bool CFxSystemSA::HasCustomDrawDistance(void)
 // Poke new draw distance for the FxSystem
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void OnMY_FxSystem_c_Update_MidA_Pre(CFxSystemSAInterface* pFxSystemSAInterface)
 {
     CFxSystemSA* pFxSystemSA = pGame->GetFxManagerSA()->GetFxSystem(pFxSystemSAInterface);
@@ -138,6 +139,7 @@ void OnMY_FxSystem_c_Update_MidA_Pre(CFxSystemSAInterface* pFxSystemSAInterface)
         ms_fUsingDrawDistance = 0;
 }
 
+__declspec(noinline)
 void OnMY_FxSystem_c_Update_MidA_Post(void)
 {
     if (ms_pUsingFxSystemSAInterface)
@@ -189,6 +191,7 @@ void _declspec(naked) HOOK_FxSystem_c_Update_MidA()
 // Poke new draw distances for each emitter
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void OnMY_FxSystem_c_Update_MidB_Pre(CFxEmitterSAInterface* pFxEmitterSAInterface)
 {
     if (ms_fUsingDrawDistance)
@@ -206,6 +209,7 @@ void OnMY_FxSystem_c_Update_MidB_Pre(CFxEmitterSAInterface* pFxEmitterSAInterfac
     }
 }
 
+__declspec(noinline)
 void OnMY_FxSystem_c_Update_MidB_Post(void)
 {
     if (ms_pUsingFxEmitterSAInterface)
diff --git a/Client/game_sa/CHandlingManagerSA.cpp b/Client/game_sa/CHandlingManagerSA.cpp
@@ -27,6 +27,7 @@ CHandlingEntrySA* CHandlingManagerSA::m_pOriginalEntries[HT_MAX];
 
 DWORD m_dwStore_Calculate = 0;
 
+__declspec(noinline)
 void DumpHandlingData(tHandlingDataSA* pData)
 {
     unsigned int iCounter = pData->iVehicleID;
diff --git a/Client/game_sa/CModelInfoSA.cpp b/Client/game_sa/CModelInfoSA.cpp
@@ -1189,6 +1189,7 @@ void CModelInfoSA::MakePedModel(char* szTexture)
 // Skip loading GTA collision model if we have replaced it
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 bool OnMY_CFileLoader_LoadCollisionFile_Mid(int iModelId)
 {
     if (MapContains(CModelInfoSA::ms_ReplacedColModels, iModelId))
@@ -1235,6 +1236,7 @@ void _declspec(naked) HOOK_CFileLoader_LoadCollisionFile_Mid()
 // Ignore extra characters in dff frame name
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void OnMY_NodeNameStreamRead(RwStream* stream, char* pDest, uint uiSize)
 {
     // Calc sizes
diff --git a/Client/game_sa/CPedSA.cpp b/Client/game_sa/CPedSA.cpp
@@ -1745,6 +1745,7 @@ ePedState CPedSA::GetPedState()
 // Check if they have already been applied.
 //
 ////////////////////////////////////////////////////////////////
+__declspec(noinline)
 int _cdecl OnCPed_PreRenderAfterTest(CPedSAInterface* pPedInterface)
 {
     if (pPedInterface->pedFlags.bCalledPreRender)
diff --git a/Client/game_sa/CPlayerPedSA.cpp b/Client/game_sa/CPlayerPedSA.cpp
@@ -492,6 +492,7 @@ int GetAnimPose(int iAnim)
 // Returns anim to use
 //
 ////////////////////////////////////////////////////////////////
+__declspec(noinline)
 int _cdecl OnCPlayerPed_ProcessAnimGroups_Mid(CPlayerPedSAInterface *pPlayerPedSAInterface, int iReqMoveAnim)
 {
     CPed *pPed = pGame->GetPools()->GetPed((DWORD *)pPlayerPedSAInterface);
@@ -553,6 +554,7 @@ void _declspec(naked) HOOK_CPlayerPed_ProcessAnimGroups_Mid()
 // Returns MOVE_PLAYER, MOVE_PLAYER_F or MOVE_PLAYER_M
 //
 ////////////////////////////////////////////////////////////////
+__declspec(noinline)
 int _cdecl OnCClothes_GetDefaultPlayerMotionGroup(int iReqMoveAnim)
 {
     CPed *pPed = g_pCore->GetMultiplayer()->GetContextSwitchedPed();
diff --git a/Client/game_sa/CRenderWareSA.ClothesReplacing.cpp b/Client/game_sa/CRenderWareSA.ClothesReplacing.cpp
@@ -110,6 +110,7 @@ bool CRenderWareSA::HasClothesReplacementChanged(void)
 // then maybe switch to replacement txd file data
 //
 ////////////////////////////////////////////////////////////////
+__declspec(noinline)
 bool _cdecl OnCStreaming_RequestModel_Mid(int flags, SImgGTAItemInfo* pImgGTAInfo)
 {
     // Check is player.img
diff --git a/Client/game_sa/CRenderWareSA.ShaderSupport.cpp b/Client/game_sa/CRenderWareSA.ShaderSupport.cpp
@@ -68,6 +68,7 @@ static CMappedArray<STxdStreamEvent> ms_txdStreamEventList;
 ////////////////////////////////////////////////////////////////
 // Txd created
 ////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void _cdecl OnStreamingAddedTxd(DWORD dwTxdId)
 {
     ushort usTxdId = (ushort)dwTxdId;
@@ -101,6 +102,7 @@ void _declspec(naked) HOOK_CTxdStore_SetupTxdParent()
 ////////////////////////////////////////////////////////////////
 // Txd remove
 ////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void _cdecl OnStreamingRemoveTxd(DWORD dwTxdId)
 {
     ushort usTxdId = (ushort)dwTxdId - 20000;
@@ -668,6 +670,7 @@ void CRenderWareSA::SetGTAVertexShadersEnabled(bool bEnable)
 // Check each created texture, so we can add special ones to the shader system
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void OnMY_RwTextureSetName(DWORD dwAddrCalledFrom, RwTexture* pTexture, const char* szName)
 {
     SString strReplacementName;
@@ -715,6 +718,7 @@ void _declspec(naked) HOOK_RwTextureSetName()
 // Check each destroyed texture, so we can remove special ones from the shader system
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void OnMY_RwTextureDestroy_Mid(RwTexture* pTexture)
 {
     pGame->GetRenderWareSA()->SpecialRemovedTexture(pTexture);
@@ -750,6 +754,7 @@ void _declspec(naked) HOOK_RwTextureDestroy_Mid()
 // Classify what is going on here
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void OnMY_RwIm3DRenderIndexedPrimitive_Pre(DWORD dwAddrCalledFrom)
 {
     if (dwAddrCalledFrom == ADDR_CVehicle_DoHeadLightBeam_RenderPrimitive || dwAddrCalledFrom == ADDR_CHeli_SearchLightCone_RenderPrimitive ||
@@ -763,6 +768,7 @@ void OnMY_RwIm3DRenderIndexedPrimitive_Pre(DWORD dwAddrCalledFrom)
     }
 }
 
+__declspec(noinline)
 void OnMY_RwIm3DRenderIndexedPrimitive_Post(DWORD dwAddrCalledFrom)
 {
     CRenderWareSA::ms_iRenderingType = RT_NONE;
@@ -811,11 +817,13 @@ void _declspec(naked) HOOK_RwIm3DRenderIndexedPrimitive()
 // Note that RwIm3DRenderPrimitive is being called to render something
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void OnMY_RwIm3DRenderPrimitive_Pre(DWORD dwAddrCalledFrom)
 {
     CRenderWareSA::ms_iRenderingType = RT_3DNI;
 }
 
+__declspec(noinline)
 void OnMY_RwIm3DRenderPrimitive_Post(DWORD dwAddrCalledFrom)
 {
     CRenderWareSA::ms_iRenderingType = RT_NONE;
@@ -864,11 +872,13 @@ void _declspec(naked) HOOK_RwIm3DRenderPrimitive()
 // Note that RwIm2DRenderIndexedPrimitive is being called to render something
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void OnMY_RwIm2DRenderIndexedPrimitive_Pre(DWORD dwAddrCalledFrom)
 {
     CRenderWareSA::ms_iRenderingType = RT_2DI;
 }
 
+__declspec(noinline)
 void OnMY_RwIm2DRenderIndexedPrimitive_Post(DWORD dwAddrCalledFrom)
 {
     CRenderWareSA::ms_iRenderingType = RT_NONE;
@@ -919,11 +929,13 @@ void _declspec(naked) HOOK_RwIm2DRenderIndexedPrimitive()
 // Note that RwIm2DRenderPrimitive is being called to render something
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void OnMY_RwIm2DRenderPrimitive_Pre(DWORD dwAddrCalledFrom)
 {
     CRenderWareSA::ms_iRenderingType = RT_2DNI;
 }
 
+__declspec(noinline)
 void OnMY_RwIm2DRenderPrimitive_Post(DWORD dwAddrCalledFrom)
 {
     CRenderWareSA::ms_iRenderingType = RT_NONE;
diff --git a/Client/game_sa/CSettingsSA.cpp b/Client/game_sa/CSettingsSA.cpp
@@ -332,6 +332,7 @@ void CSettingsSA::SetVolumetricShadowsSuspended(bool bSuspended)
 DWORD dwFxQualityValue = 0;
 WORD  usCallingForVehicleModel = 0;
 
+__declspec(noinline)
 void _cdecl MaybeAlterFxQualityValue(DWORD dwAddrCalledFrom)
 {
     // Handle all calls from CVolumetricShadowMgr
@@ -829,6 +830,7 @@ int CSettingsSA::OnSelectDevice(void)
 //   * Choose whether to show the device selection dialog box
 //
 //////////////////////////////////////////////////////////////////////////////////////////
+__declspec(noinline)
 int OnMY_SelectDevice(void)
 {
     CSettingsSA* gameSettings = (CSettingsSA*)pGame->GetSettings();
diff --git a/Client/game_sa/CTaskManagementSystemSA.cpp b/Client/game_sa/CTaskManagementSystemSA.cpp
@@ -242,6 +242,11 @@ CTask* CTaskManagementSystemSA::CreateAppropriateTask(CTaskSAInterface* pTaskInt
 }
 
 // HOOKS
+__declspec(noinline)
+void OnMY_Task_Operator_Delete(CTaskSAInterface* pTaskInterface)
+{
+    ((CTaskManagementSystemSA*)(pGame->GetTaskManagementSystem()))->RemoveTask(pTempTaskInterface);
+}
 
 VOID _declspec(naked) HOOK_CTask_Operator_Delete()
 {
@@ -253,7 +258,7 @@ VOID _declspec(naked) HOOK_CTask_Operator_Delete()
         pushad
         }
 
-    ((CTaskManagementSystemSA*)(pGame->GetTaskManagementSystem()))->RemoveTask(pTempTaskInterface);
+    OnMY_Task_Operator_Delete(pTempTaskInterface);
 
     // Continue on our merry way....
     _asm
diff --git a/Client/game_sa/CTasksSA.cpp b/Client/game_sa/CTasksSA.cpp
@@ -303,6 +303,7 @@ CTaskSimpleFight* CTasksSA::CreateTaskSimpleFight(CEntity* pTargetEntity, int nC
 // Detect when GTA will start the 'be hit' task
 //
 ////////////////////////////////////////////////////////////////
+__declspec(noinline)
 void _cdecl OnCEventHandler_ComputeDamageResponse_Mid(CPedSAInterface* pPedVictim, CPedSAInterface* pPedAttacker, ePedPieceTypes hitBodyPart, int hitBodySide,
                                                       int weaponId)
 {
diff --git a/Client/game_sa/CTextSA.cpp b/Client/game_sa/CTextSA.cpp
@@ -43,6 +43,7 @@ void CTextSA::SetText(char* szKey, char* szValue)
     }
 }
 
+__declspec(noinline)
 char* GetReplacementText(char* szKey)
 {
     // NOTE: This is really slow (0.8% of program time spent here) so needs to be
diff --git a/Client/multiplayer_sa/premake5.lua b/Client/multiplayer_sa/premake5.lua
@@ -32,4 +32,28 @@ project "Multiplayer SA"
 		flags { "ExcludeFromBuild" } 
 	
 	filter "system:not windows"
-		flags { "ExcludeFromBuild" } 
+		flags { "ExcludeFromBuild" } 
+
+	filter { "configurations:Release or configurations:Nightly",
+        "files:CMultiplayerSA.cpp" .. " or " ..
+        "files:CMultiplayerSA_1.3.cpp" .. " or " ..
+        "files:CMultiplayerSA_ClothesCache.cpp" .. " or " ..
+        "files:CMultiplayerSA_ClothesMemFix.cpp" .. " or " ..
+        "files:CMultiplayerSA_ClothesSpeedUp.cpp" .. " or " ..
+        "files:CMultiplayerSA_CrashFixHacks.cpp" .. " or " ..
+        "files:CMultiplayerSA_Direct3D.cpp" .. " or " ..
+        "files:CMultiplayerSA_Files.cpp" .. " or " ..
+        "files:CMultiplayerSA_FixBadAnimId.cpp" .. " or " ..
+        "files:CMultiplayerSA_FixLineOfSightArgs.cpp" .. " or " ..
+        "files:CMultiplayerSA_HookDestructors.cpp" .. " or " ..
+        "files:CMultiplayerSA_LicensePlate.cpp" .. " or " ..
+        "files:CMultiplayerSA_ObjectLODSystem.cpp" .. " or " ..
+        "files:CMultiplayerSA_Rendering.cpp" .. " or " ..
+        "files:CMultiplayerSA_RwResources.cpp" .. " or " ..
+        "files:CMultiplayerSA_VehicleDamage.cpp" .. " or " ..
+        "files:CMultiplayerSA_VehicleLights.cpp" .. " or " ..
+        "files:CMultiplayerSA_Weapons.cpp" .. " or " ..
+        "files:CPopulationSA.cpp" .. " or " ..
+        "files:multiplayer_keysync.cpp" .. " or " ..
+        "files:multiplayer_shotsync.cpp" }
+        buildoptions { "/Ob1" }   -- Expand only functions marked as inline

Original file line number	Diff line number	Diff line change
`@@ -426,6 +426,7 @@ VOID CAudioEngineSA::UpdateAmbientSoundSettings(void)`
`426`	`426`	`MemPut<BYTE>(0x507814, 0x33); // No gunfire`
`427`	`427`	`}`
`428`	`428`
	`429`	`+__declspec(noinline)`
`429`	`430`	`bool _cdecl IsAmbientSoundGeneralEnabled(void)`
`430`	`431`	`{`
`431`	`432`	`if (pGame)`
`@@ -505,6 +506,7 @@ bool CAudioEngineSA::OnWorldSound(CAESound* pAESound)`
`505`	`506`
`506`	`507`	`////////////////////////////////////////////////////////////////////////////////////////////////`
`507`	`508`	`// Return false to skip sound`
	`509`	`+__declspec(noinline)`
`508`	`510`	`bool _cdecl On_CAESoundManager_RequestNewSound(CAESound* pAESound)`
`509`	`511`	`{`
`510`	`512`	`return g_pAudioSA->OnWorldSound(pAESound);`
Original file line number	Diff line number	Diff line change
`@@ -568,6 +568,7 @@ void CCameraSA::GetCameraClip(bool &bObjects, bool &bVehicles)`
`568`	`568`	`bVehicles = bCameraClipVehicles;`
`569`	`569`	`}`
`570`	`570`
	`571`	`+__declspec(noinline)`
`571`	`572`	`void _cdecl DoCameraCollisionDetectionPokes()`
`572`	`573`	`{`
`573`	`574`	`if (!bCameraClipObjects)`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ bool CFxSystemSA::HasCustomDrawDistance(void)`
`123`	`123`	`// Poke new draw distance for the FxSystem`
`124`	`124`	`//`
`125`	`125`	`//////////////////////////////////////////////////////////////////////////////////////////`
	`126`	`+__declspec(noinline)`
`126`	`127`	`void OnMY_FxSystem_c_Update_MidA_Pre(CFxSystemSAInterface* pFxSystemSAInterface)`
`127`	`128`	`{`
`128`	`129`	`CFxSystemSA* pFxSystemSA = pGame->GetFxManagerSA()->GetFxSystem(pFxSystemSAInterface);`
`@@ -138,6 +139,7 @@ void OnMY_FxSystem_c_Update_MidA_Pre(CFxSystemSAInterface* pFxSystemSAInterface)`
`138`	`139`	`ms_fUsingDrawDistance = 0;`
`139`	`140`	`}`
`140`	`141`
	`142`	`+__declspec(noinline)`
`141`	`143`	`void OnMY_FxSystem_c_Update_MidA_Post(void)`
`142`	`144`	`{`
`143`	`145`	`if (ms_pUsingFxSystemSAInterface)`
`@@ -189,6 +191,7 @@ void _declspec(naked) HOOK_FxSystem_c_Update_MidA()`
`189`	`191`	`// Poke new draw distances for each emitter`
`190`	`192`	`//`
`191`	`193`	`//////////////////////////////////////////////////////////////////////////////////////////`
	`194`	`+__declspec(noinline)`
`192`	`195`	`void OnMY_FxSystem_c_Update_MidB_Pre(CFxEmitterSAInterface* pFxEmitterSAInterface)`
`193`	`196`	`{`
`194`	`197`	`if (ms_fUsingDrawDistance)`
`@@ -206,6 +209,7 @@ void OnMY_FxSystem_c_Update_MidB_Pre(CFxEmitterSAInterface* pFxEmitterSAInterfac`
`206`	`209`	`}`
`207`	`210`	`}`
`208`	`211`
	`212`	`+__declspec(noinline)`
`209`	`213`	`void OnMY_FxSystem_c_Update_MidB_Post(void)`
`210`	`214`	`{`
`211`	`215`	`if (ms_pUsingFxEmitterSAInterface)`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ CHandlingEntrySA* CHandlingManagerSA::m_pOriginalEntries[HT_MAX];`
`27`	`27`
`28`	`28`	`DWORD m_dwStore_Calculate = 0;`
`29`	`29`
	`30`	`+__declspec(noinline)`
`30`	`31`	`void DumpHandlingData(tHandlingDataSA* pData)`
`31`	`32`	`{`
`32`	`33`	`unsigned int iCounter = pData->iVehicleID;`
Original file line number	Diff line number	Diff line change
`@@ -1745,6 +1745,7 @@ ePedState CPedSA::GetPedState()`
`1745`	`1745`	`// Check if they have already been applied.`
`1746`	`1746`	`//`
`1747`	`1747`	`////////////////////////////////////////////////////////////////`
	`1748`	`+__declspec(noinline)`
`1748`	`1749`	`int _cdecl OnCPed_PreRenderAfterTest(CPedSAInterface* pPedInterface)`
`1749`	`1750`	`{`
`1750`	`1751`	`if (pPedInterface->pedFlags.bCalledPreRender)`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ bool CRenderWareSA::HasClothesReplacementChanged(void)`
`110`	`110`	`// then maybe switch to replacement txd file data`
`111`	`111`	`//`
`112`	`112`	`////////////////////////////////////////////////////////////////`
	`113`	`+__declspec(noinline)`
`113`	`114`	`bool _cdecl OnCStreaming_RequestModel_Mid(int flags, SImgGTAItemInfo* pImgGTAInfo)`
`114`	`115`	`{`
`115`	`116`	`// Check is player.img`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ static CMappedArray<STxdStreamEvent> ms_txdStreamEventList;`
`68`	`68`	`////////////////////////////////////////////////////////////////`
`69`	`69`	`// Txd created`
`70`	`70`	`////////////////////////////////////////////////////////////////`
	`71`	`+__declspec(noinline)`
`71`	`72`	`void _cdecl OnStreamingAddedTxd(DWORD dwTxdId)`
`72`	`73`	`{`
`73`	`74`	`ushort usTxdId = (ushort)dwTxdId;`
`@@ -101,6 +102,7 @@ void _declspec(naked) HOOK_CTxdStore_SetupTxdParent()`
`101`	`102`	`////////////////////////////////////////////////////////////////`
`102`	`103`	`// Txd remove`
`103`	`104`	`////////////////////////////////////////////////////////////////`
	`105`	`+__declspec(noinline)`
`104`	`106`	`void _cdecl OnStreamingRemoveTxd(DWORD dwTxdId)`
`105`	`107`	`{`
`106`	`108`	`ushort usTxdId = (ushort)dwTxdId - 20000;`
`@@ -668,6 +670,7 @@ void CRenderWareSA::SetGTAVertexShadersEnabled(bool bEnable)`
`668`	`670`	`// Check each created texture, so we can add special ones to the shader system`
`669`	`671`	`//`
`670`	`672`	`//////////////////////////////////////////////////////////////////////////////////////////`
	`673`	`+__declspec(noinline)`
`671`	`674`	`void OnMY_RwTextureSetName(DWORD dwAddrCalledFrom, RwTexture* pTexture, const char* szName)`
`672`	`675`	`{`
`673`	`676`	`SString strReplacementName;`
`@@ -715,6 +718,7 @@ void _declspec(naked) HOOK_RwTextureSetName()`
`715`	`718`	`// Check each destroyed texture, so we can remove special ones from the shader system`
`716`	`719`	`//`
`717`	`720`	`//////////////////////////////////////////////////////////////////////////////////////////`
	`721`	`+__declspec(noinline)`
`718`	`722`	`void OnMY_RwTextureDestroy_Mid(RwTexture* pTexture)`
`719`	`723`	`{`
`720`	`724`	`pGame->GetRenderWareSA()->SpecialRemovedTexture(pTexture);`
`@@ -750,6 +754,7 @@ void _declspec(naked) HOOK_RwTextureDestroy_Mid()`
`750`	`754`	`// Classify what is going on here`
`751`	`755`	`//`
`752`	`756`	`//////////////////////////////////////////////////////////////////////////////////////////`
	`757`	`+__declspec(noinline)`
`753`	`758`	`void OnMY_RwIm3DRenderIndexedPrimitive_Pre(DWORD dwAddrCalledFrom)`
`754`	`759`	`{`
`755`	`760`	`if (dwAddrCalledFrom == ADDR_CVehicle_DoHeadLightBeam_RenderPrimitive \|\| dwAddrCalledFrom == ADDR_CHeli_SearchLightCone_RenderPrimitive \|\|`
`@@ -763,6 +768,7 @@ void OnMY_RwIm3DRenderIndexedPrimitive_Pre(DWORD dwAddrCalledFrom)`
`763`	`768`	`}`
`764`	`769`	`}`
`765`	`770`
	`771`	`+__declspec(noinline)`
`766`	`772`	`void OnMY_RwIm3DRenderIndexedPrimitive_Post(DWORD dwAddrCalledFrom)`
`767`	`773`	`{`
`768`	`774`	`CRenderWareSA::ms_iRenderingType = RT_NONE;`
`@@ -811,11 +817,13 @@ void _declspec(naked) HOOK_RwIm3DRenderIndexedPrimitive()`
`811`	`817`	`// Note that RwIm3DRenderPrimitive is being called to render something`
`812`	`818`	`//`
`813`	`819`	`//////////////////////////////////////////////////////////////////////////////////////////`
	`820`	`+__declspec(noinline)`
`814`	`821`	`void OnMY_RwIm3DRenderPrimitive_Pre(DWORD dwAddrCalledFrom)`
`815`	`822`	`{`
`816`	`823`	`CRenderWareSA::ms_iRenderingType = RT_3DNI;`
`817`	`824`	`}`
`818`	`825`
	`826`	`+__declspec(noinline)`
`819`	`827`	`void OnMY_RwIm3DRenderPrimitive_Post(DWORD dwAddrCalledFrom)`
`820`	`828`	`{`
`821`	`829`	`CRenderWareSA::ms_iRenderingType = RT_NONE;`
`@@ -864,11 +872,13 @@ void _declspec(naked) HOOK_RwIm3DRenderPrimitive()`
`864`	`872`	`// Note that RwIm2DRenderIndexedPrimitive is being called to render something`
`865`	`873`	`//`
`866`	`874`	`//////////////////////////////////////////////////////////////////////////////////////////`
	`875`	`+__declspec(noinline)`
`867`	`876`	`void OnMY_RwIm2DRenderIndexedPrimitive_Pre(DWORD dwAddrCalledFrom)`
`868`	`877`	`{`
`869`	`878`	`CRenderWareSA::ms_iRenderingType = RT_2DI;`
`870`	`879`	`}`
`871`	`880`
	`881`	`+__declspec(noinline)`
`872`	`882`	`void OnMY_RwIm2DRenderIndexedPrimitive_Post(DWORD dwAddrCalledFrom)`
`873`	`883`	`{`
`874`	`884`	`CRenderWareSA::ms_iRenderingType = RT_NONE;`
`@@ -919,11 +929,13 @@ void _declspec(naked) HOOK_RwIm2DRenderIndexedPrimitive()`
`919`	`929`	`// Note that RwIm2DRenderPrimitive is being called to render something`
`920`	`930`	`//`
`921`	`931`	`//////////////////////////////////////////////////////////////////////////////////////////`
	`932`	`+__declspec(noinline)`
`922`	`933`	`void OnMY_RwIm2DRenderPrimitive_Pre(DWORD dwAddrCalledFrom)`
`923`	`934`	`{`
`924`	`935`	`CRenderWareSA::ms_iRenderingType = RT_2DNI;`
`925`	`936`	`}`
`926`	`937`
	`938`	`+__declspec(noinline)`
`927`	`939`	`void OnMY_RwIm2DRenderPrimitive_Post(DWORD dwAddrCalledFrom)`
`928`	`940`	`{`
`929`	`941`	`CRenderWareSA::ms_iRenderingType = RT_NONE;`
Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,7 @@ void CSettingsSA::SetVolumetricShadowsSuspended(bool bSuspended)`
`332`	`332`	`DWORD dwFxQualityValue = 0;`
`333`	`333`	`WORD usCallingForVehicleModel = 0;`
`334`	`334`
	`335`	`+__declspec(noinline)`
`335`	`336`	`void _cdecl MaybeAlterFxQualityValue(DWORD dwAddrCalledFrom)`
`336`	`337`	`{`
`337`	`338`	`// Handle all calls from CVolumetricShadowMgr`
`@@ -829,6 +830,7 @@ int CSettingsSA::OnSelectDevice(void)`
`829`	`830`	`// * Choose whether to show the device selection dialog box`
`830`	`831`	`//`
`831`	`832`	`//////////////////////////////////////////////////////////////////////////////////////////`
	`833`	`+__declspec(noinline)`
`832`	`834`	`int OnMY_SelectDevice(void)`
`833`	`835`	`{`
`834`	`836`	`CSettingsSA* gameSettings = (CSettingsSA*)pGame->GetSettings();`