Merge dc04c3ca39 into d191bdf3b4

This also includes a small wrapper to call a C++ function from GCC-style inline ASM

These statements almost work on llvm-mingw too (but there's some stubborn call instructions)

DDraw/DDraw.def

@@ -1,3 +1,3 @@
 LIBRARY DDRAW
 EXPORTS
-	DirectDrawCreateEx=_DirectDrawCreateEx@16 @10
+	DirectDrawCreateEx = DirectDrawCreateEx@16

DDraw/DDraw.vcxproj

@@ -83,7 +83,6 @@
       <AdditionalOptions>/Zc:threadSafeInit- /Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>ddraw.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <DelayLoadDLLs>shell32.dll;shlwapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <LargeAddressAware>true</LargeAddressAware>
@@ -113,7 +112,6 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>ddraw.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <DelayLoadDLLs>shell32.dll;shlwapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <LargeAddressAware>true</LargeAddressAware>
@@ -143,7 +141,6 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>ddraw.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <DelayLoadDLLs>shell32.dll;shlwapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <LargeAddressAware>true</LargeAddressAware>
@@ -172,4 +169,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

DDraw/dllmain.cpp

@@ -4,8 +4,8 @@
 
 #include <windows.h>
 #include <stdio.h>
-#include <Shlwapi.h>
-#include <ShlObj.h>
+#include <shlwapi.h>
+#include <shlobj.h>
 #include "Utils/MemoryMgr.h"
 #include "Utils/Patterns.h"
 #include "Utils/ScopedUnprotect.hpp"
@@ -14,6 +14,7 @@
 #include "Desktop.h"
 
 #pragma comment(lib, "shlwapi.lib")
+#pragma comment(linker, "/EXPORT:DirectDrawCreateEx=_DirectDrawCreateEx@16")
 
 extern "C" HRESULT WINAPI DirectDrawCreateEx(GUID FAR *lpGUID, LPVOID *lplpDD, REFIID iid, IUnknown FAR *pUnkOuter)
 {
@@ -197,7 +198,7 @@ static bool PatchIAT()
 static bool PatchIAT_ByPointers()
 {
 	pOrgSystemParametersInfoA = SystemParametersInfoA;
-	memcpy( orgCode, pOrgSystemParametersInfoA, sizeof(orgCode) );
+	memcpy( orgCode, reinterpret_cast<void*>(pOrgSystemParametersInfoA), sizeof(orgCode) );
 	Memory::VP::InjectHook( pOrgSystemParametersInfoA, SystemParametersInfoA_OverwritingHook, Memory::HookType::Jump );
 	return true;
 }
@@ -230,4 +231,4 @@ extern "C" __declspec(dllexport)
 uint32_t GetBuildNumber()
 {
 	return (SILENTPATCH_REVISION_ID << 8) | SILENTPATCH_BUILD_ID;
-}
+}

SilentPatch/Common.cpp

@@ -34,7 +34,7 @@ namespace HandlingNameLoadFix
 // ============= Corona lines rendering fix =============
 namespace CoronaLinesFix
 {
-	static decltype(RwIm2DRenderLine)* orgRwIm2DRenderLine;
+	static RwIm2DRenderLineFunction orgRwIm2DRenderLine;
 	static RwBool RenderLine_SetRecipZ( RwIm2DVertex *vertices, RwInt32 numVertices, RwInt32 vert1, RwInt32 vert2 )
 	{
 		const RwReal nearScreenZ = RwIm2DGetNearScreenZ();
@@ -379,4 +379,4 @@ namespace Common {
 			TXN_CATCH();
 		}
 	}
-}
+}

SilentPatch/Common.h

@@ -2,6 +2,13 @@
 
 #include <cstdint>
 
+// Workaround for old MSVC inline function bugs
+#if defined(_MSC_VER) && _MSC_VER < 1930
+#define STATIC_INLINE static
+#else
+#define STATIC_INLINE static inline
+#endif
+
 namespace ExtraCompSpecularity
 {
 	void ReadExtraCompSpecularityExceptions(const wchar_t* pPath);
@@ -15,4 +22,4 @@ namespace Common
 		void III_VC_Common();
 		void III_VC_SetDelayedPatchesFunc( void(*func)() );
 	}
-};
+};

SilentPatch/Common_ddraw.cpp

@@ -1,22 +1,20 @@
-#include "Common_ddraw.h"
-
 #define WIN32_LEAN_AND_MEAN
 
 #define WINVER 0x0501
 #define _WIN32_WINNT 0x0501
 #define NOMINMAX
 
+#include "Common_ddraw.h"
+
 #include <windows.h>
 
-#include <Shlwapi.h>
-#include <ShlObj.h>
+#include <shlwapi.h>
+#include <shlobj.h>
 #include "Utils/MemoryMgr.h"
 #include "Utils/Patterns.h"
 
 #pragma comment(lib, "shlwapi.lib")
 
-extern char** ppUserFilesDir;
-
 namespace Common {
 	char* GetMyDocumentsPath()
 	{

SilentPatch/Common_ddraw.h

@@ -2,6 +2,8 @@
 
 #include <cstdint>
 
+extern char** ppUserFilesDir;
+
 namespace Common
 {
 	namespace Patches
@@ -18,4 +20,4 @@ namespace Common
 
 		void DDraw_Common();
 	}
-};
+};

SilentPatch/Desktop.cpp

@@ -1,11 +1,11 @@
-#include "Desktop.h"
-
 #define WIN32_LEAN_AND_MEAN
 
 #define WINVER 0x0501
 #define _WIN32_WINNT 0x0501
 #define NOMINMAX
 
+#include "Desktop.h"
+
 #include <windows.h>
 
 std::pair<uint32_t, uint32_t> GetDesktopResolution()
@@ -21,4 +21,4 @@ std::pair<uint32_t, uint32_t> GetDesktopResolution()
 		result.second = displaySettings.dmPelsHeight;
 	}
 	return result;
-}
+}

SilentPatch/FriendlyMonitorNames.cpp

@@ -1,5 +1,3 @@
-#include "FriendlyMonitorNames.h"
-
 // This API is Win7 only, so make sure we use dynamic imports
 #define WIN32_LEAN_AND_MEAN
 
@@ -7,6 +5,8 @@
 #define WINVER 0x0602
 #define _WIN32_WINNT 0x0602
 
+#include "FriendlyMonitorNames.h"
+
 #include <windows.h>
 
 #include <memory>

SilentPatch/Maths.h

@@ -6,6 +6,15 @@
 
 #include <rwcore.h>
 
+// FIXME: Common.h might be a better place for this (but SA doesn't include it)
+#ifdef _MSC_VER
+#define NOBUFFERCHECKS __declspec(safebuffers)
+#elif defined(__GNUC__) && !defined(__clang__)
+#define NOBUFFERCHECKS __attribute__((optimize("-fno-stack-protector")))
+#else
+#define NOBUFFERCHECKS __attribute__((no_stack_protector))
+#endif
+
 constexpr double RAD_TO_DEG (180.0/M_PI);
 constexpr double DEG_TO_RAD (M_PI/180.0);
 
@@ -570,4 +579,4 @@ public:
 		return angle;
 	}
 
-};
+};

SilentPatch/ParseUtils.cpp

@@ -1,8 +1,9 @@
-#include "ParseUtils.hpp"
-
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#include <Windows.h>
+
+#include "ParseUtils.hpp"
+
+#include <windows.h>
 
 static std::string WcharToUTF8(std::wstring_view str)
 {

SilentPatch/RWGTA.cpp

@@ -1,8 +1,6 @@
 #include "Utils/MemoryMgr.h"
 #include "Utils/Patterns.h"
 
-#define RwEngineInstance (*rwengine)
-
 #include <rwcore.h>
 #include "RWGTA.h"
 
@@ -52,6 +50,7 @@ void RwD3D8GetRenderState(RwUInt32 state, void* value)
 	fnRwD3D8GetRenderState(state, value);
 }
 
+#ifndef RwIm2DGetNearScreenZ
 RwReal RwIm2DGetNearScreenZ()
 {
 	return RWSRCGLOBAL(dOpenDevice).zBufferNear;
@@ -66,6 +65,7 @@ RwBool RwRenderStateSet(RwRenderState state, void *value)
 {
 	return RWSRCGLOBAL(dOpenDevice).fpRenderStateSet(state, value);
 }
+#endif
 
 // Unreachable stub
 RwBool RwMatrixDestroy(RwMatrix* /*mpMat*/) { assert(!"Unreachable!"); return TRUE; }
@@ -78,19 +78,19 @@ bool RWGTA::Patches::TryLocateRwD3D8() try
 	auto pfnRwD3D8SetRenderState = [] {
 		try {
 			// Everything except for III Steam
-			return static_cast<decltype(RwD3D8SetRenderState)*>(get_pattern("39 0C C5 ? ? ? ? 74 31", -8));
+			return reinterpret_cast<decltype(RwD3D8SetRenderState)*>(get_pattern("39 0C C5 ? ? ? ? 74 31", -8));
 		} catch (const hook::txn_exception&) {
 			// III Steam
-			return static_cast<decltype(RwD3D8SetRenderState)*>(get_pattern("8B 0C C5 ? ? ? ? 3B CA", -8));
+			return reinterpret_cast<decltype(RwD3D8SetRenderState)*>(get_pattern("8B 0C C5 ? ? ? ? 3B CA", -8));
 		}
 	}();
 	auto pfnRwD3D8GetRenderState = [] {
 		try {
 			// Everything except for III Steam
-			return static_cast<decltype(RwD3D8GetRenderState)*>(get_pattern("8B 0C C5 ? ? ? ? 89 0A C3", -8));
+			return reinterpret_cast<decltype(RwD3D8GetRenderState)*>(get_pattern("8B 0C C5 ? ? ? ? 89 0A C3", -8));
 		} catch (const hook::txn_exception&) {
 			// III Steam
-			return static_cast<decltype(RwD3D8GetRenderState)*>(get_pattern("8B 04 C5 ? ? ? ? 89 02 C3", -8));
+			return reinterpret_cast<decltype(RwD3D8GetRenderState)*>(get_pattern("8B 04 C5 ? ? ? ? 89 02 C3", -8));
 		}
 	}();
 
@@ -101,4 +101,4 @@ bool RWGTA::Patches::TryLocateRwD3D8() try
 catch (const hook::txn_exception&)
 {
 	return false;
-}
+}

SilentPatch/RWGTA.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#define RwEngineInstance (*rwengine)
+
+extern void** rwengine;
+
 namespace RWGTA::Patches
 {
 	bool TryLocateRwD3D8();

SilentPatch/RWUtils.hpp

@@ -3,6 +3,10 @@
 #include <rwcore.h>
 #include <rpworld.h>
 
+#define RwEngineInstance (*rwengine)
+
+extern void** rwengine;
+
 template<RwRenderState State>
 class RwScopedRenderState
 {
@@ -68,4 +72,4 @@ Pred RpGeometryForAllMaterials(RpGeometry* geometry, Pred callback)
 			break;
 	}
 	return callback;
-}
+}

SilentPatch/SVF.cpp

@@ -1,9 +1,13 @@
 #include "SVF.h"
 
-#include <cstdint>
 #include <algorithm>
 #include <map>
 
+#ifndef _MSC_VER
+#include <cstring>
+#define _stricmp strcasecmp
+#endif
+
 namespace SVF
 {
 	Feature GetFeatureFromName( const char* featureName )
@@ -233,4 +237,4 @@ __declspec(dllexport) void DisableStockVehiclesForSpecialVehicleFeature( const c
 	SVF::DisableStockVehiclesForFeature( SVF::GetFeatureFromName(featureName) );
 }
 
-}
+}

SilentPatch/SVF.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <functional>
 #include <string>
 
@@ -60,4 +61,4 @@ namespace SVF
 
 	void RegisterGetModelInfoCB(void*(*func)(const char*, int*));
 	void MarkModelNamesReady();
-};
+};

SilentPatch/TheFLAUtils.cpp

@@ -1,7 +1,7 @@
 #include "TheFLAUtils.h"
 
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
 
 #include "Utils/ModuleList.hpp"
 
@@ -39,4 +39,4 @@ bool FLAUtils::UsesEnhancedIMGs()
 	const auto func = reinterpret_cast<bool(*)()>(GetProcAddress( flaModule, "IsHandlingOfEnhancedIMGarchivesEnabled" ));
 	if ( func == nullptr ) return false;
 	return func();
-}
+}

SilentPatch/Timer.h

@@ -1,6 +1,8 @@
 #ifndef __TIMER
 #define __TIMER
 
+#include <cmath>
+
 class CTimer
 {
 public:
@@ -16,4 +18,4 @@ public:
 	static void				Update_SilentPatch();
 };
 
-#endif
+#endif

SilentPatchIII/ModelInfoIII.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <functional>
 #include "Maths.h"
 
 #include <rwcore.h>

SilentPatchIII/SilentPatchIII.cpp

@@ -12,7 +12,7 @@
 
 #include <array>
 #include <memory>
-#include <Shlwapi.h>
+#include <shlwapi.h>
 
 #include "Utils/ModuleList.hpp"
 #include "Utils/Patterns.h"
@@ -194,38 +194,72 @@ void ResetMousePos()
 	orgConstructRenderList();
 }
 
-void __declspec(naked) M16StatsFix()
+__declspec(naked) void M16StatsFix()
 {
+#ifdef _MSC_VER
 	_asm
 	{
-		add		eax, 34h
-		add		ebx, 34h
-		mov		ecx, [InstantHitsFiredByPlayer]
-		inc		[ecx]
-		retn
+		add		eax, 0x34
+		add		ebx, 0x34
+		mov		ecx, InstantHitsFiredByPlayer
+		inc		dword ptr [ecx]
+		ret
 	}
+#else
+	__asm__ volatile
+	(
+		"add 	eax, 0x34\n"
+		"add 	ebx, 0x34\n"
+		"mov 	ecx, %[InstantHitsFiredByPlayer]\n"
+		"inc 	dword ptr [ecx]\n"
+		"ret"
+		:: [InstantHitsFiredByPlayer] "m" (InstantHitsFiredByPlayer)
+	);
+#endif
 }
 
-void __declspec(naked) HeadlightsFix()
+static const float fMinusOne = -1.0f;
+__declspec(naked) void HeadlightsFix()
 {
-	static const float		fMinusOne = -1.0f;
+#ifdef _MSC_VER
 	_asm
 	{
-		fld		[esp+708h-690h]
+		fld		dword ptr [esp+0x708-0x690]
 		fcomp	fMinusOne
 		fnstsw	ax
 		and		ah, 5
 		cmp		ah, 1
 		jnz		HeadlightsFix_DontLimit
 		fld		fMinusOne
-		fstp	[esp+708h-690h]
+		fstp	dword ptr [esp+0x708-0x690]
 
-HeadlightsFix_DontLimit:
-		fld		[esp+708h-690h]
+	HeadlightsFix_DontLimit:
+		fld		dword ptr [esp+0x708-0x690]
 		fabs
 		fld		st
-		jmp		[HeadlightsFix_JumpBack]
+		jmp		HeadlightsFix_JumpBack
 	}
+#else
+	__asm__ volatile
+	(
+		"fld	dword ptr [esp+0x708-0x690]\n"
+		"fcomp	%[fMinusOne]\n"
+		"fnstsw	ax\n"
+		"and	ah, 5\n"
+		"cmp	ah, 1\n"
+		"jnz	HeadlightsFix_DontLimit\n"
+		"fld	%[fMinusOne]\n"
+		"fstp	dword ptr [esp+0x708-0x690]\n"
+
+"HeadlightsFix_DontLimit:\n"
+		"fld	dword ptr [esp+0x708-0x690]\n"
+		"fabs\n"
+		"fld	st\n"
+		"jmp	%[HeadlightsFix_JumpBack]"
+		:: [fMinusOne] "f" (fMinusOne),
+		[HeadlightsFix_JumpBack] "m" (HeadlightsFix_JumpBack)
+	);
+#endif
 }
 
 static float fShadowXSize, fShadowYSize;
@@ -312,75 +346,140 @@ float FixedRefValue()
 	return 1.0f;
 }
 
-void __declspec(naked) SubtitlesShadowFix()
+__declspec(naked) void SubtitlesShadowFix()
 {
+#ifdef _MSC_VER
 	_asm
 	{
 		push	eax
 		call	Recalculate
-		fadd	[esp+50h+8]
-		fadd	[fShadowYSize]
+		fadd	dword ptr [esp+0x50+8]
+		fadd	fShadowYSize
 		jmp		SubtitlesShadowFix_JumpBack
 	}
+#else
+	__asm__ volatile
+	(
+		"push	eax\n"
+		"call	%[Recalculate]\n"
+		"fadd	dword ptr [esp+0x50+8]\n"
+		"fadd	%[fShadowYSize]\n"
+		"jmp 	%[SubtitlesShadowFix_JumpBack]"
+		:: [Recalculate] "i" (Recalculate),
+		[fShadowYSize] "m" (fShadowYSize),
+		[SubtitlesShadowFix_JumpBack] "m" (SubtitlesShadowFix_JumpBack)
+	);
+#endif
 }
 
-void __declspec(naked) III_SensResetFix()
+__declspec(naked) void III_SensResetFix()
 {
+#ifdef _MSC_VER
 	_asm
 	{
-		mov     ecx, 3A76h
+		mov     ecx, 0x3A76
 		mov     edi, ebp
-		fld     dword ptr [ebp+194h]
-		fld     dword ptr [ebp+198h]
+		fld     dword ptr [ebp+0x194]
+		fld     dword ptr [ebp+0x198]
 		rep		stosd
-		fstp	dword ptr [ebp+198h]
-		fstp	dword ptr [ebp+194h]
-		retn
+		fstp	dword ptr [ebp+0x198]
+		fstp	dword ptr [ebp+0x194]
+		ret
 	}
+#else
+	__asm__ volatile
+	(
+		"mov	ecx, 0x3A76\n"
+		"mov	edi, ebp\n"
+		"fld	dword ptr [ebp+0x194]\n"
+		"fld	dword ptr [ebp+0x198]\n"
+		"rep	stosd\n"
+		"fstp	dword ptr [ebp+0x198]\n"
+		"fstp	dword ptr [ebp+0x194]\n"
+		"ret"
+	);
+#endif
 }
 
 static void* RadarBoundsCheckCoordBlip_JumpBack = AddressByVersion<void*>(0x4A55B8, 0x4A56A8, 0x4A5638);
 static void* RadarBoundsCheckCoordBlip_Count = AddressByVersion<void*>(0x4A55AF, 0x4A569F, 0x4A562F);
-void __declspec(naked) RadarBoundsCheckCoordBlip()
+__declspec(naked) void RadarBoundsCheckCoordBlip()
 {
+#ifdef _MSC_VER
 	_asm
 	{
-		mov		edx, dword ptr [RadarBoundsCheckCoordBlip_Count]
+		mov		edx, RadarBoundsCheckCoordBlip_Count
 		cmp		cl, byte ptr [edx]
 		jnb		OutOfBounds
 		mov     edx, ecx
 		mov     eax, [esp+4]
 		jmp		RadarBoundsCheckCoordBlip_JumpBack
 
-OutOfBounds:
+	OutOfBounds:
 		or		eax, -1
 		fcompp
-		retn
+		ret
 	}
+#else
+	__asm__ volatile
+	(
+		"mov	edx, %[RadarBoundsCheckCoordBlip_Count]\n"
+		"cmp	cl, byte ptr [edx]\n"
+		"jnb	OutOfBounds\n"
+		"mov    edx, ecx\n"
+		"mov    eax, [esp+4]\n"
+		"jmp	%[RadarBoundsCheckCoordBlip_JumpBack]\n"
+
+"OutOfBounds:\n"
+		"or		eax, -1\n"
+		"fcompp\n"
+		"ret"
+		:: [RadarBoundsCheckCoordBlip_Count] "m" (RadarBoundsCheckCoordBlip_Count),
+		[RadarBoundsCheckCoordBlip_JumpBack] "m" (RadarBoundsCheckCoordBlip_JumpBack)
+	);
+#endif
 }
 
 static void* RadarBoundsCheckEntityBlip_JumpBack = AddressByVersion<void*>(0x4A565E, 0x4A574E, 0x4A56DE);
-void __declspec(naked) RadarBoundsCheckEntityBlip()
+__declspec(naked) void RadarBoundsCheckEntityBlip()
 {
+#ifdef _MSC_VER
 	_asm
 	{
-		mov		edx, dword ptr [RadarBoundsCheckCoordBlip_Count]
+		mov		edx, RadarBoundsCheckCoordBlip_Count
 		cmp		cl, byte ptr [edx]
 		jnb		OutOfBounds
 		mov     edx, ecx
 		mov     eax, [esp+4]
 		jmp		RadarBoundsCheckEntityBlip_JumpBack
 
-		OutOfBounds:
+	OutOfBounds:
 		or		eax, -1
-		retn
+		ret
 	}
+#else
+	__asm__ volatile
+	(
+		"mov	edx, %[RadarBoundsCheckCoordBlip_Count]\n"
+		"cmp	cl, byte ptr [edx]\n"
+		"jnb	OutOfBounds2\n"
+		"mov    edx, ecx\n"
+		"mov    eax, [esp+4]\n"
+		"jmp	%[RadarBoundsCheckEntityBlip_JumpBack]\n"
+
+		"OutOfBounds2:\n"
+		"or		eax, -1\n"
+		"ret"
+		:: [RadarBoundsCheckCoordBlip_Count] "m" (RadarBoundsCheckCoordBlip_Count),
+		[RadarBoundsCheckEntityBlip_JumpBack] "m" (RadarBoundsCheckEntityBlip_JumpBack)
+	);
+#endif
 }
 
-extern char** ppUserFilesDir = AddressByVersion<char**>(0x580C16, 0x580F66, 0x580E66);
+char** ppUserFilesDir = AddressByVersion<char**>(0x580C16, 0x580F66, 0x580E66);
 
 static LARGE_INTEGER	FrameTime;
-__declspec(safebuffers) int32_t GetTimeSinceLastFrame()
+NOBUFFERCHECKS int32_t GetTimeSinceLastFrame()
 {
 	LARGE_INTEGER	curTime;
 	QueryPerformanceCounter(&curTime);
@@ -411,11 +510,13 @@ unsigned int __cdecl AutoPilotTimerCalculation_III(unsigned int nTimer, int nSca
 	return nTimer - static_cast<unsigned int>(nScaleFactor * fScaleCoef);
 }
 
-void __declspec(naked) AutoPilotTimerFix_III()
+__declspec(naked) void AutoPilotTimerFix_III()
 {
-	_asm {
-		push    dword ptr[esp + 0x4]
-		push    dword ptr[ebx + 0x10]
+#ifdef _MSC_VER
+	_asm
+	{
+		push    dword ptr [esp + 0x4]
+		push    dword ptr [ebx + 0x10]
 		push    eax
 		call    AutoPilotTimerCalculation_III
 		add     esp, 0xC
@@ -424,8 +525,25 @@ void __declspec(naked) AutoPilotTimerFix_III()
 		pop     ebp
 		pop     esi
 		pop     ebx
-		retn    4
+		ret     4
 	}
+#else
+	__asm__ volatile
+	(
+		"push	dword ptr [esp + 0x4]\n"
+		"push	dword ptr [ebx + 0x10]\n"
+		"push	eax\n"
+		"call	%[AutoPilotTimerCalculation_III]\n"
+		"add	esp, 0xC\n"
+		"mov	[ebx + 0xC], eax\n"
+		"add	esp, 0x28\n"
+		"pop	ebp\n"
+		"pop	esi\n"
+		"pop	ebx\n"
+		"ret	4"
+		:: [AutoPilotTimerCalculation_III] "i" (AutoPilotTimerCalculation_III)
+	);
+#endif
 }
 
 namespace ZeroAmmoFix
@@ -542,7 +660,7 @@ namespace Localization
 // ============= Call cDMAudio::IsAudioInitialised before adding one shot sounds, like in VC =============
 namespace AudioInitializedFix
 {
-	auto IsAudioInitialised = static_cast<bool(*)()>(Memory::ReadCallFrom( hook::get_pattern( "E8 ? ? ? ? 84 C0 74 ? 0F B7 47 10" ) ));
+	auto IsAudioInitialised = reinterpret_cast<bool(*)()>(Memory::ReadCallFrom( hook::get_pattern( "E8 ? ? ? ? 84 C0 74 ? 0F B7 47 10" ) ));
 	void* (*operatorNew)(size_t size);
 
 	void* operatorNew_InitializedCheck( size_t size )
@@ -576,23 +694,39 @@ namespace SirenSwitchingFix
 // ============= Fixed vehicles exploding twice if the driver leaves the car while it's exploding =============
 namespace RemoveDriverStatusFix
 {
-	__declspec(naked) void RemoveDriver_SetStatus()
+	__declspec(naked) static void RemoveDriver_SetStatus()
 	{
 		// if (m_nStatus != STATUS_WRECKED)
 		//   m_nStatus = STATUS_ABANDONED;
+#ifdef _MSC_VER
 		_asm
 		{
-			mov		ah, [ecx+50h]
+			mov		ah, [ecx+0x50]
 			mov		al, ah
-			and		ah, 0F8h
-			cmp		ah, 28h
+			and		ah, 0xF8
+			cmp		ah, 0x28
 			je		DontSetStatus
 			and     al, 7
-			or      al, 20h
+			or      al, 0x20
 
 		DontSetStatus:
-			retn
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"mov	ah, [ecx+0x50]\n"
+			"mov	al, ah\n"
+			"and	ah, 0xF8\n"
+			"cmp	ah, 0x28\n"
+			"je		DontSetStatus\n"
+			"and    al, 7\n"
+			"or     al, 0x20\n"
+
+		"DontSetStatus:\n"
+			"ret"
+		);
+#endif
 	}
 }
 
@@ -623,18 +757,32 @@ namespace EvasiveDiveFix
 		return CGeneral::LimitRadianAngle(angle);
 	}
 
-	__declspec(naked) void CalculateAngle_Hook()
+	__declspec(naked) static void CalculateAngle_Hook()
 	{
+#ifdef _MSC_VER
 		_asm
 		{
-			push    dword ptr [esi+7Ch]
-			push	dword ptr [esi+78h]
+			push    dword ptr [esi+0x7C]
+			push	dword ptr [esi+0x78]
 			call	CalculateAngle
 			add		esp, 8
 
 			mov     ecx, ebp
-			retn
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"push	dword ptr [esi+0x7C]\n"
+			"push	dword ptr [esi+0x78]\n"
+			"call	%[CalculateAngle]\n"
+			"add	esp, 8\n"
+
+			"mov	ecx, ebp\n"
+			"ret"
+			:: [CalculateAngle] "i" (CalculateAngle)
+		);
+#endif
 	}
 }
 
@@ -647,36 +795,69 @@ namespace NullTerminatedLines
 	static void* orgSscanf_LoadPath;
 	__declspec(naked) static void sscanf1_LoadPath_Terminate()
 	{
+#ifdef _MSC_VER
 		_asm
 		{
 			mov		eax, [esp+4]
 			mov		byte ptr [eax+ecx], 0
-			jmp		[orgSscanf_LoadPath]
+			jmp		orgSscanf_LoadPath
 		}
+#else
+		__asm__ volatile
+		(
+			"mov	eax, [esp+4]\n"
+			"mov	byte ptr [eax+ecx], 0\n"
+			"jmp	%[orgSscanf_LoadPath]"
+			:: [orgSscanf_LoadPath] "m" (orgSscanf_LoadPath)
+		);
+#endif
 	}
 
 	static void* orgSscanf1;
 	__declspec(naked) static void sscanf1_Terminate()
 	{
+#ifdef _MSC_VER
 		_asm
 		{
 			mov		eax, [esp+4]
 			mov		byte ptr [eax+ecx], 0
-			jmp		[orgSscanf1]
+			jmp		orgSscanf1
 		}
+#else
+		__asm__ volatile
+		(
+			"mov	eax, [esp+4]\n"
+			"mov	byte ptr [eax+ecx], 0\n"
+			"jmp	%[orgSscanf1]"
+			:: [orgSscanf1] "m" (orgSscanf1)
+		);
+#endif
 	}
 
 	__declspec(naked) static void ReadTrackFile_Terminate()
 	{
+#ifdef _MSC_VER
 		_asm
 		{
-			mov		ecx, [gString]
+			mov		ecx, gString
 			mov		byte ptr [ecx+edx], 0
 			mov     ecx, [esi]
 			inc     ebp
-			add     ecx, [esp+0ACh-98h]
-			retn
+			add     ecx, [esp+0xAC-0x98]
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"mov	ecx, %[gString]\n"
+			"mov	byte ptr [ecx+edx], 0\n"
+			"mov	ecx, [esi]\n"
+			"inc	ebp\n"
+			"add	ecx, [esp+0xAC-0x98]\n"
+			"ret"
+			:: [gString] "m" (gString)
+		);
+#endif
 	}
 }
 
@@ -703,17 +884,33 @@ namespace DodoKeyboardControls
 	static void* (*orgFindPlayerVehicle)();
 	__declspec(naked) static void FindPlayerVehicle_DodoCheck()
 	{
+#ifdef _MSC_VER
 		_asm
 		{
-			call	[orgFindPlayerVehicle]
-			mov		ecx, [bAllDodosCheat]
+			call	orgFindPlayerVehicle
+			mov		ecx, bAllDodosCheat
 			cmp		byte ptr [ecx], 0
 			je		CheatDisabled
-			mov		byte ptr [esp+1Ch-14h], 1
+			mov		byte ptr [esp+0x1C-0x14], 1
 
 		CheatDisabled:
-			retn
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"call	%[orgFindPlayerVehicle]\n"
+			"mov	ecx, %[bAllDodosCheat]\n"
+			"cmp	byte ptr [ecx], 0\n"
+			"je		CheatDisabled\n"
+			"mov	byte ptr [esp+0x1C-0x14], 1\n"
+
+		"CheatDisabled:\n"
+			"ret"
+			:: [orgFindPlayerVehicle] "m" (orgFindPlayerVehicle),
+			[bAllDodosCheat] "m" (bAllDodosCheat)
+		);
+#endif
 	}
 }
 
@@ -768,11 +965,12 @@ namespace GenerateNewPickup_ReuseObjectFix
 	static void* pPickupObject;
 	static void (*orgGiveUsAPickUpObject)(int);
 
-	__declspec(naked) void GiveUsAPickUpObject_CleanUpObject()
+	__declspec(naked) static void GiveUsAPickUpObject_CleanUpObject()
 	{
+#ifdef _MSC_VER
 		_asm
 		{
-			mov		eax, [pPickupObject]
+			mov		eax, pPickupObject
 			add		eax, ebp
 			mov		eax, [eax]
 			test	eax, eax
@@ -781,7 +979,7 @@ namespace GenerateNewPickup_ReuseObjectFix
 			mov		edi, eax
 
 			push	edi
-			call	[WorldRemove]
+			call	WorldRemove
 			add		esp, 4
 
 			// Call dtor
@@ -793,8 +991,38 @@ namespace GenerateNewPickup_ReuseObjectFix
 			pop		edi
 
 		NoPickup:
-			jmp		[orgGiveUsAPickUpObject]
+			jmp		orgGiveUsAPickUpObject
 		}
+#else
+		__asm__ volatile
+		(
+			"mov	eax, %[pPickupObject]\n"
+			"add	eax, ebp\n"
+			"mov	eax, [eax]\n"
+			"test	eax, eax\n"
+			"jz		NoPickup\n"
+			"push	edi\n"
+			"mov	edi, eax\n"
+
+			"push	edi\n"
+			"call	offset %[WorldRemove]\n"
+			"add	esp, 4\n"
+
+			// Call dtor
+			"mov	ecx, edi\n"
+			"mov	eax, [edi]\n"
+			"push	1\n"
+			"call	dword ptr [eax]\n"
+
+			"pop	edi\n"
+
+		"NoPickup:\n"
+			"jmp	%[orgGiveUsAPickUpObject]"
+			:: [pPickupObject] "m" (pPickupObject),
+			[WorldRemove] "m" (WorldRemove),
+			[orgGiveUsAPickUpObject] "m" (orgGiveUsAPickUpObject)
+		);
+#endif
 	}
 }
 
@@ -1027,7 +1255,7 @@ namespace SlidingTextsScalingFixes
 		static inline float** pHorShadowValue;
 
 		template<std::size_t Index>
-		static void (*orgPrintString)(float,float,const wchar_t*);
+		STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
 
 		template<std::size_t Index>
 		static void PrintString_Slide(float fX, float fY, const wchar_t* pText)
@@ -1054,7 +1282,7 @@ namespace SlidingTextsScalingFixes
 		static inline bool bSlidingEnabled = false;
 
 		template<std::size_t Index>
-		static void (*orgPrintString)(float,float,const wchar_t*);
+		STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
 
 		template<std::size_t Index>
 		static void PrintString_Slide(float fX, float fY, const wchar_t* pText)
@@ -2499,4 +2727,4 @@ extern "C" __declspec(dllexport)
 uint32_t GetBuildNumber()
 {
 	return (SILENTPATCH_REVISION_ID << 8) | SILENTPATCH_BUILD_ID;
-}
+}

SilentPatchIII/versionmeta.props

@@ -6,7 +6,7 @@
 	<SILENTPATCH_EXT>.asi</SILENTPATCH_EXT>
     <SILENTPATCH_FULL_NAME>SilentPatch for GTA III</SILENTPATCH_FULL_NAME>
     <SILENTPATCH_REVISION_ID>9</SILENTPATCH_REVISION_ID>
-	<SILENTPATCH_BUILD_ID>1</SILENTPATCH_BUILD_ID>
+	<SILENTPATCH_BUILD_ID>2</SILENTPATCH_BUILD_ID>
     <SILENTPATCH_COPYRIGHT>2013-2024</SILENTPATCH_COPYRIGHT>
   </PropertyGroup>
   <PropertyGroup />

SilentPatchSA/AudioHardwareSA.h

@@ -2,7 +2,7 @@
 #define __AUDIOHARDWARE
 
 // IStream
-#include <Objidl.h>
+#include <objidl.h>
 
 enum eDecoderType
 {
@@ -205,4 +205,4 @@ public:
 static_assert(sizeof(CAEDataStreamOld) == 0x28, "Wrong size: CAEDataStreamOld");
 static_assert(sizeof(CAEDataStreamNew) == 0x2C, "Wrong size: CAEDataStreamNew");
 
-#endif
+#endif

SilentPatchSA/FLACDecoderSA.h

@@ -3,8 +3,8 @@
 #include "AudioHardwareSA.h"
 
 // libflac
-#include "FLAC\stream_decoder.h"
-#include "FLAC\metadata.h"
+#include "FLAC/stream_decoder.h"
+#include "FLAC/metadata.h"
 
 class CAEFLACDecoder final : public CAEStreamingDecoder
 {
@@ -45,4 +45,4 @@ public:
 	{ return m_streamMeta->data.stream_info.sample_rate; }
 	virtual uint32_t		GetStreamID() const override
 	{ return GetStream()->GetID(); }
-};
+};

SilentPatchSA/GeneralSA.h

@@ -2,6 +2,7 @@
 #define __GENERAL
 
 #include <stdint.h>
+#include "Common.h"
 #include "TheFLAUtils.h"
 
 class CSimpleTransform
@@ -570,4 +571,4 @@ static_assert(sizeof(CPhysical) == 0x138, "Wrong size: CPhysical");
 static_assert(sizeof(CObject) == 0x17C, "Wrong size: CObject");
 static_assert(sizeof(CEscalator) == 0x150, "Wrong size: CEscalator");
 
-#endif
+#endif

SilentPatchSA/PedSA.cpp

@@ -131,7 +131,7 @@ uint8_t CPed::GetWeaponSkillForRenderWeaponPedsForPC_SAMP()
 
 bool CTaskComplexSequence::Contains(int taskID) const
 {
-	for (CTask* task : m_taskSequence)
+	for (const CTask* task : m_taskSequence)
 	{
 		if (task != nullptr && task->GetTaskType() == taskID)
 		{

SilentPatchSA/VehicleSA.h

@@ -302,7 +302,7 @@ public:
 
 private:
 	template<std::size_t Index>
-	static void (CVehicle::*orgDoHeadLightBeam)(int type, CMatrix& m, bool right);
+	STATIC_INLINE void (CVehicle::*orgDoHeadLightBeam)(int type, CMatrix& m, bool right);
 
 	template<std::size_t Index>
 	void DoHeadLightBeam_LightBeamFixSaveObj(int type, CMatrix& m, bool right)
@@ -337,7 +337,7 @@ public:
 
 public:
 	template<std::size_t Index>
-	static void (CAutomobile::*orgAutomobilePreRender)();
+	STATIC_INLINE void (CAutomobile::*orgAutomobilePreRender)();
 
 	template<std::size_t Index>
 	void		PreRender_SilentPatch()
@@ -352,7 +352,7 @@ public:
 	void HideDestroyedWheels_SilentPatch(void (CAutomobile::*spawnFlyingComponentCB)(int, unsigned int), int nodeID, unsigned int modelID);
 
 	template<std::size_t Index>
-	static void (CAutomobile::*orgSpawnFlyingComponent)(int, unsigned int);
+	STATIC_INLINE void (CAutomobile::*orgSpawnFlyingComponent)(int, unsigned int);
 
 	template<std::size_t Index>
 	void		SpawnFlyingComponent_HideWheels(int nodeID, unsigned int modelID)
@@ -448,7 +448,7 @@ private:
 
 private:
 	template<std::size_t Index>
-	static CVehicle* (CStoredCar::*orgRestoreCar)();
+	STATIC_INLINE CVehicle* (CStoredCar::*orgRestoreCar)();
 	
 	template<std::size_t Index>
 	CVehicle* RestoreCar_SilentPatch()
@@ -477,4 +477,4 @@ static_assert(sizeof(CVehicle) == 0x5A0, "Wrong size: CVehicle");
 static_assert(sizeof(CAutomobile) == 0x988, "Wrong size: CAutomobile");
 static_assert(sizeof(CStoredCar) == 0x40, "Wrong size: CStoredCar");
 
-#endif
+#endif

SilentPatchVC/SilentPatchVC.cpp

@@ -16,7 +16,7 @@
 
 #include <array>
 #include <memory>
-#include <Shlwapi.h>
+#include <shlwapi.h>
 #include <time.h>
 
 #include "Utils/ModuleList.hpp"
@@ -356,7 +356,7 @@ namespace RadarTraceOutlineFixes
 		}
 
 		template<std::size_t Index>
-		static void (*orgShowRadarTraceWithHeight)(float, float, unsigned int, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char);
+		STATIC_INLINE void (*orgShowRadarTraceWithHeight)(float, float, unsigned int, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char);
 
 		template<std::size_t Index>
 		static void ShowRadarTraceWithHeight_RecalculatePositions(float a1, float a2, unsigned int a3, unsigned char a4, unsigned char a5, unsigned char a6, unsigned char a7, unsigned char a8)
@@ -456,7 +456,7 @@ namespace SlidingTextsScalingFixes
 		static inline bool bSlidingEnabled = false;
 
 		template<std::size_t Index>
-		static void (*orgPrintString)(float,float,const wchar_t*);
+		STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
 
 		template<std::size_t Index>
 		static void PrintString_Slide(float fX, float fY, const wchar_t* pText)
@@ -466,7 +466,7 @@ namespace SlidingTextsScalingFixes
 		}
 
 		template<std::size_t Index>
-		static void (*orgSetRightJustifyWrap)(float wrap);
+		STATIC_INLINE void (*orgSetRightJustifyWrap)(float wrap);
 
 		template<std::size_t Index>
 		static void SetRightJustifyWrap_Slide(float wrap)
@@ -483,7 +483,7 @@ namespace SlidingTextsScalingFixes
 		static inline bool bSlidingEnabled = false;
 
 		template<std::size_t Index>
-		static void (*orgPrintString)(float,float,const wchar_t*);
+		STATIC_INLINE void (*orgPrintString)(float,float,const wchar_t*);
 
 		template<std::size_t Index>
 		static void PrintString_Slide(float fX, float fY, const wchar_t* pText)
@@ -669,12 +669,13 @@ float FixedRefValue()
 	return 1.0f;
 }
 
-void __declspec(naked) SubtitlesShadowFix()
+__declspec(naked) void SubtitlesShadowFix()
 {
+#ifdef MSC_VER
 	_asm
 	{
 		mov		[esp], eax
-		fild	[esp]
+		fild	dword ptr [esp]
 		push	eax
 		lea		eax, [esp+20h-18h]
 		push	eax
@@ -683,23 +684,56 @@ void __declspec(naked) SubtitlesShadowFix()
 		call	Recalculate
 		jmp		SubtitlesShadowFix_JumpBack
 	}
+#else
+	__asm__ volatile
+	(
+		"mov	[esp], eax\n"
+		"fild	dword ptr [esp]\n"
+		"push	eax\n"
+		"lea	eax, [esp+0x20-0x18]\n"
+		"push	eax\n"
+		"lea	eax, [esp+0x24-0x14]\n"
+		"push	eax\n"
+		"call	%[Recalculate]\n"
+		"jmp	%[SubtitlesShadowFix_JumpBack]"
+		:: [Recalculate] "i" (Recalculate),
+		[SubtitlesShadowFix_JumpBack] "m" (SubtitlesShadowFix_JumpBack)
+	);
+#endif
 }
 
-void __declspec(naked) CreateInstance_BikeFix()
+// C-style wrapper for calling a C++ function in GCC-style inline assembly (the function signature is really important here)
+RwFrame* __thiscall CVehicleModelInfo_GetExtrasFrame(CVehicleModelInfo* modelInfo, RpClump* clump)
 {
+	return modelInfo->GetExtrasFrame(clump);
+}
+
+__declspec(naked) void CreateInstance_BikeFix()
+{
+#ifdef MSC_VER
 	_asm
 	{
 		push	eax
 		mov		ecx, ebp
 		call	CVehicleModelInfo::GetExtrasFrame
-		retn
+		ret
 	}
+#else
+	__asm__ volatile
+	(
+		"push	eax\n"
+		"mov	ecx, ebp\n"
+		"call	%[CVehicleModelInfo_GetExtrasFrame]\n"
+		"ret"
+		:: [CVehicleModelInfo_GetExtrasFrame] "i" (CVehicleModelInfo_GetExtrasFrame)
+	);
+#endif
 }
 
-extern char** ppUserFilesDir = AddressByVersion<char**>(0x6022AA, 0x60228A, 0x601ECA);
+char** ppUserFilesDir = AddressByVersion<char**>(0x6022AA, 0x60228A, 0x601ECA);
 
 static LARGE_INTEGER	FrameTime;
-__declspec(safebuffers) int32_t GetTimeSinceLastFrame()
+NOBUFFERCHECKS int32_t GetTimeSinceLastFrame()
 {
 	LARGE_INTEGER	curTime;
 	QueryPerformanceCounter(&curTime);
@@ -731,11 +765,13 @@ unsigned int __cdecl AutoPilotTimerCalculation_VC(unsigned int nTimer, int nScal
 	return nTimer - static_cast<unsigned int>(nScaleFactor * fScaleCoef);
 }
 
-void __declspec(naked) AutoPilotTimerFix_VC()
+__declspec(naked) void AutoPilotTimerFix_VC()
 {
-	_asm {
-		push	dword ptr[esp + 0xC]
-		push	dword ptr[ebx + 0x10]
+#ifdef MSC_VER
+	_asm
+	{
+		push	dword ptr [esp + 0xC]
+		push	dword ptr [ebx + 0x10]
 		push	eax
 		call	AutoPilotTimerCalculation_VC
 		add 	esp, 0xC
@@ -743,8 +779,24 @@ void __declspec(naked) AutoPilotTimerFix_VC()
 		add     esp, 0x30
 		pop     ebp
 		pop     ebx
-		retn    4
+		ret     4
 	}
+#else
+	__asm__ volatile
+	(
+		"push	dword ptr [esp + 0xC]\n"
+		"push	dword ptr [ebx + 0x10]\n"
+		"push	eax\n"
+		"call	%[AutoPilotTimerCalculation_VC]\n"
+		"add	esp, 0xC\n"
+		"mov	[ebx + 0xC], eax\n"
+		"add	esp, 0x30\n"
+		"pop	ebp\n"
+		"pop	ebx\n"
+		"ret	4"
+		:: [AutoPilotTimerCalculation_VC] "i" (AutoPilotTimerCalculation_VC)
+	);
+#endif
 }
 
 
@@ -863,24 +915,43 @@ namespace Localization
 // ============= Corrected FBI Washington sirens sound =============
 namespace SirenSwitchingFix
 {
-	void __declspec(naked) IsFBIRanchOrFBICar()
+	__declspec(naked) static void IsFBIRanchOrFBICar()
 	{
+#ifdef MSC_VER
 		_asm
 		{
-			mov     dword ptr [esi+1Ch], 1Ch
+			mov     dword ptr [esi+0x1C], 0x1C
 
 			// al = 0 - high pitched siren
 			// al = 1 - normal siren
-			cmp     dword ptr [ebp+14h], 90		// fbiranch
+			cmp     dword ptr [ebp+0x14], 90	// fbiranch
 			je      IsFBIRanchOrFBICar_HighPitchSiren
-			cmp     dword ptr [ebp+14h], 17		// fbicar
+			cmp     dword ptr [ebp+0x14], 17	// fbicar
 			setne   al
-			retn
+			ret
 
 		IsFBIRanchOrFBICar_HighPitchSiren:
 			xor     al, al
-			retn
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"mov    dword ptr [esi+0x1C], 0x1C\n"
+
+			// al = 0 - high pitched siren
+			// al = 1 - normal siren
+			"cmp    dword ptr [ebp+0x14], 90\n"	// fbiranch
+			"je     IsFBIRanchOrFBICar_HighPitchSiren\n"
+			"cmp    dword ptr [ebp+0x14], 17\n"	// fbicar
+			"setne  al\n"
+			"ret\n"
+
+		"IsFBIRanchOrFBICar_HighPitchSiren:\n"
+			"xor    al, al\n"
+			"ret"
+		);
+#endif
 	}
 }
 
@@ -945,23 +1016,39 @@ namespace FBISirenCoronaFix
 // ============= Fixed vehicles exploding twice if the driver leaves the car while it's exploding =============
 namespace RemoveDriverStatusFix
 {
-	__declspec(naked) void RemoveDriver_SetStatus()
+	__declspec(naked) static void RemoveDriver_SetStatus()
 	{
 		// if (m_nStatus != STATUS_WRECKED)
 		//   m_nStatus = STATUS_ABANDONED;
+#ifdef MSC_VER
 		_asm
 		{
-			mov		cl, [ebx+50h]
+			mov		cl, [ebx+0x50]
 			mov		al, cl
-			and		cl, 0F8h
-			cmp		cl, 28h
+			and		cl, 0xF8
+			cmp		cl, 0x28
 			je		DontSetStatus
 			and     al, 7
-			or      al, 20h
+			or      al, 0x20
 
 		DontSetStatus:
-			retn
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"mov	cl, [ebx+0x50]\n"
+			"mov	al, cl\n"
+			"and	cl, 0xF8\n"
+			"cmp	cl, 0x28\n"
+			"je		DontSetStatus\n"
+			"and    al, 7\n"
+			"or     al, 0x20\n"
+
+		"DontSetStatus:\n"
+			"ret"
+		);
+#endif
 	}
 }
 
@@ -1034,12 +1121,22 @@ namespace NullTerminatedLines
 	static void* orgSscanf_LoadPath;
 	__declspec(naked) static void sscanf1_LoadPath_Terminate()
 	{
+#ifdef MSC_VER
 		_asm
 		{
 			mov		eax, [esp+4]
 			mov		byte ptr [eax+ecx], 0
-			jmp		[orgSscanf_LoadPath]
+			jmp		orgSscanf_LoadPath
 		}
+#else
+		__asm__ volatile
+		(
+			"mov	eax, [esp+4]\n"
+			"mov	byte ptr [eax+ecx], 0\n"
+			"jmp	%[orgSscanf_LoadPath]"
+			:: [orgSscanf_LoadPath] "m" (orgSscanf_LoadPath)
+		);
+#endif
 	}
 }
 
@@ -1064,21 +1161,31 @@ namespace PickupEffectsFixes
 {
 	__declspec(naked) static void PickUpEffects_BigDollarColor()
 	{
+#ifdef MSC_VER
 		_asm
 		{
-			mov		byte ptr [esp+184h-170h], 0
-			mov		dword ptr [esp+184h-174h], 37
-			retn
+			mov		byte ptr [esp+0x184-0x170], 0
+			mov		dword ptr [esp+0x184-0x174], 37
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"mov	byte ptr [esp+0x184-0x170], 0\n"
+			"mov	dword ptr [esp+0x184-0x174], 37\n"
+			"ret"
+		);
+#endif
 	}
 
 	__declspec(naked) static void PickUpEffects_Minigun2Glow()
 	{
+#ifdef MSC_VER
 		_asm
 		{
 			cmp		ecx, 294	// minigun2
 			jnz		NotMinigun2
-			mov		byte ptr [esp+184h-170h], 0
+			mov		byte ptr [esp+0x184-0x170], 0
 			xor		eax, eax
 			jmp		Return
 
@@ -1087,8 +1194,25 @@ namespace PickupEffectsFixes
 
 		Return:
 			mov     ebx, ecx
-			retn
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"cmp	ecx, 294\n"	// minigun2
+			"jnz	NotMinigun2\n"
+			"mov	byte ptr [esp+0x184-0x170], 0\n"
+			"xor	eax, eax\n"
+			"jmp	Return\n"
+
+		"NotMinigun2:\n"
+			"lea    eax, [ecx+1]\n"
+
+		"Return:\n"
+			"mov    ebx, ecx\n"
+			"ret"
+		);
+#endif
 	}
 }
 
@@ -1105,26 +1229,52 @@ namespace IsPlayerTargettingCharFix
 	__declspec(naked) static void IsPlayerTargettingChar_ExtraChecks()
 	{
 		// After this extra block of code, there is a jz Return, so set ZF to 0 here if this path is to be entered
+#ifdef MSC_VER
 		_asm
 		{
 			test	bl, bl
 			jnz		ReturnToUpdateCompareFlag
-			mov		eax, [bUseMouse3rdPerson]
+			mov		eax, bUseMouse3rdPerson
 			cmp		byte ptr [eax], 0
 			jne		CmpAndReturn
-			mov		ecx, [TheCamera]
-			call	[Using1stPersonWeaponMode]
+			mov		ecx, TheCamera
+			call	Using1stPersonWeaponMode
 			test	al, al
 			jz		ReturnToUpdateCompareFlag
 
 		CmpAndReturn:
-			cmp     byte ptr [esp+11Ch-10Ch], 0
-			retn
+			cmp     byte ptr [esp+0x11C-0x10C], 0
+			ret
 
 		ReturnToUpdateCompareFlag:
 			xor		al, al
-			retn
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"test	bl, bl\n"
+			"jnz	ReturnToUpdateCompareFlag\n"
+			"mov	eax, %[bUseMouse3rdPerson]\n"
+			"cmp	byte ptr [eax], 0\n"
+			"jne	CmpAndReturn\n"
+			"mov	ecx, %[TheCamera]\n"
+			"call	%[Using1stPersonWeaponMode]\n"
+			"test	al, al\n"
+			"jz		ReturnToUpdateCompareFlag\n"
+
+		"CmpAndReturn:\n"
+			"cmp    byte ptr [esp+0x11C-0x10C], 0\n"
+			"ret\n"
+
+		"ReturnToUpdateCompareFlag:\n"
+			"xor	al, al\n"
+			"ret"
+			:: [bUseMouse3rdPerson] "m" (bUseMouse3rdPerson),
+			[TheCamera] "m" (TheCamera),
+			[Using1stPersonWeaponMode] "m" (Using1stPersonWeaponMode)
+		);
+#endif
 	}
 }
 
@@ -1210,13 +1360,24 @@ namespace SelectableBackfaceCulling
 	static void* EntityRender_Prologue_JumpBack;
 	__declspec(naked) static void __fastcall EntityRender_Original(CEntity*)
 	{
+#ifdef MSC_VER
 		_asm
 		{
 			push    ebx
 			mov     ebx, ecx
-			cmp     dword ptr [ebx+4Ch], 0
-			jmp		[EntityRender_Prologue_JumpBack]
+			cmp     dword ptr [ebx+0x4C], 0
+			jmp		EntityRender_Prologue_JumpBack
 		}
+#else
+		__asm__ volatile
+		(
+			"push   ebx\n"
+			"mov    ebx, ecx\n"
+			"cmp    dword ptr [ebx+0x4C], 0\n"
+			"jmp	%[EntityRender_Prologue_JumpBack]"
+			:: [EntityRender_Prologue_JumpBack] "m" (EntityRender_Prologue_JumpBack)
+		);
+#endif
 	}
 
 	static bool ShouldDisableBackfaceCulling(const CEntity* entity)
@@ -1390,16 +1551,28 @@ namespace TommyFistShakeWithWeapons
 		return !bWeaponAllowsFistShake;
 	}
 
-	static __declspec(naked) void CheckWeaponGroupHook()
+	__declspec(naked) static void CheckWeaponGroupHook()
 	{
+#ifdef MSC_VER
 		_asm
 		{
 			push	dword ptr [eax]
 			call	WeaponProhibitsFistShake
 			add		esp, 4
 			test	al, al
-			retn
+			ret
 		}
+#else
+		__asm__ volatile
+		(
+			"push	dword ptr [eax]\n"
+			"call	%[WeaponProhibitsFistShake]\n"
+			"add	esp, 4\n"
+			"test	al, al\n"
+			"ret"
+			:: [WeaponProhibitsFistShake] "i" (WeaponProhibitsFistShake)
+		);
+#endif
 	}
 
 	template<std::size_t Index>
@@ -1875,7 +2048,7 @@ void InjectDelayedPatches_VC_Common( bool bHasDebugMenu, const wchar_t* wcModule
 
 
 		// Stuff to let us (re)initialize
-		static void (*HUDReInitialise)() = static_cast<decltype(HUDReInitialise)>(get_pattern("31 C0 53 0F EF C0 C6 05"));
+		static void (*HUDReInitialise)() = reinterpret_cast<decltype(HUDReInitialise)>(get_pattern("31 C0 53 0F EF C0 C6 05"));
 
 		// This pattern has 5 hits - first 2 are in Reinitialise, the rest is in Initialise
 		auto reinitialise1 = pattern("C7 05 ? ? ? ? 05 00 00 00 66 C7 05 ? ? ? ? 00 00 C7 05 ? ? ? ? 00 00 00 00").count(5);
@@ -2758,7 +2931,7 @@ void Patch_VC_Common()
 		using namespace IsPlayerTargettingCharFix;
 
 		auto isPlayerTargettingChar = pattern("83 7C 24 ? ? A3 ? ? ? ? 0F 84").get_one();
-		auto using1stPersonWeaponMode = static_cast<decltype(Using1stPersonWeaponMode)>(get_pattern("66 83 F8 07 74 18", -7));
+		auto using1stPersonWeaponMode = reinterpret_cast<decltype(Using1stPersonWeaponMode)>(get_pattern("66 83 F8 07 74 18", -7));
 		bool* useMouse3rdPerson = *get_pattern<bool*>("80 3D ? ? ? ? ? 75 09 66 C7 05 ? ? ? ? ? ? 8B 35", 2);
 		void* theCamera = *get_pattern<void*>("B9 ? ? ? ? 31 DB E8", 1);
 
@@ -2982,4 +3155,4 @@ extern "C" __declspec(dllexport)
 uint32_t GetBuildNumber()
 {
 	return (SILENTPATCH_REVISION_ID << 8) | SILENTPATCH_BUILD_ID;
-}
+}