mirror of
https://github.com/CookiePLMonster/SilentPatch.git
synced 2024-12-28 14:53:01 +05:00
Merge a8c40aabde into 50c3a47cd3
This commit is contained in:
Echo J.
GitHub
commit
4a0882a55b
26 changed files with 505 additions and 2115 deletions
|
|
@ -1,3 +1,3 @@
|
|||
LIBRARY DDRAW
|
||||
EXPORTS
|
||||
DirectDrawCreateEx=_DirectDrawCreateEx@16 @10
|
||||
DirectDrawCreateEx = DirectDrawCreateEx@16
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)() );
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
#include <cstdint>
|
||||
|
||||
extern char** ppUserFilesDir;
|
||||
|
||||
namespace Common
|
||||
{
|
||||
namespace Patches
|
||||
|
|
@ -18,4 +20,4 @@ namespace Common
|
|||
|
||||
void DDraw_Common();
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
#pragma once
|
||||
|
||||
#define RwEngineInstance (*rwengine)
|
||||
|
||||
extern void** rwengine;
|
||||
|
||||
namespace RWGTA::Patches
|
||||
{
|
||||
bool TryLocateRwD3D8();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
#ifndef __TIMER
|
||||
#define __TIMER
|
||||
|
||||
#include <cmath>
|
||||
|
||||
class CTimer
|
||||
{
|
||||
public:
|
||||
|
|
@ -16,4 +18,4 @@ public:
|
|||
static void Update_SilentPatch();
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <functional>
|
||||
#include "Maths.h"
|
||||
|
||||
#include <rwcore.h>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include <array>
|
||||
#include <memory>
|
||||
#include <Shlwapi.h>
|
||||
#include <shlwapi.h>
|
||||
|
||||
#include "Utils/ModuleList.hpp"
|
||||
#include "Utils/Patterns.h"
|
||||
|
|
@ -196,6 +196,7 @@ void ResetMousePos()
|
|||
|
||||
__declspec(naked) void M16StatsFix()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
add eax, 0x34
|
||||
|
|
@ -204,11 +205,23 @@ __declspec(naked) void M16StatsFix()
|
|||
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
|
||||
}
|
||||
|
||||
static const float fMinusOne = -1.0f;
|
||||
__declspec(naked) void HeadlightsFix()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
fld dword ptr [esp+0x708-0x690]
|
||||
|
|
@ -226,6 +239,27 @@ __declspec(naked) void HeadlightsFix()
|
|||
fld st
|
||||
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;
|
||||
|
|
@ -314,6 +348,7 @@ float FixedRefValue()
|
|||
|
||||
__declspec(naked) void SubtitlesShadowFix()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
push eax
|
||||
|
|
@ -322,10 +357,24 @@ __declspec(naked) void SubtitlesShadowFix()
|
|||
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
|
||||
}
|
||||
|
||||
__declspec(naked) void III_SensResetFix()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
mov ecx, 0x3A76
|
||||
|
|
@ -337,12 +386,26 @@ __declspec(naked) void III_SensResetFix()
|
|||
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);
|
||||
__declspec(naked) void RadarBoundsCheckCoordBlip()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
mov edx, RadarBoundsCheckCoordBlip_Count
|
||||
|
|
@ -357,11 +420,30 @@ __declspec(naked) void RadarBoundsCheckCoordBlip()
|
|||
fcompp
|
||||
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);
|
||||
__declspec(naked) void RadarBoundsCheckEntityBlip()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
mov edx, RadarBoundsCheckCoordBlip_Count
|
||||
|
|
@ -375,12 +457,29 @@ __declspec(naked) void RadarBoundsCheckEntityBlip()
|
|||
or eax, -1
|
||||
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);
|
||||
|
|
@ -413,6 +512,7 @@ unsigned int __cdecl AutoPilotTimerCalculation_III(unsigned int nTimer, int nSca
|
|||
|
||||
__declspec(naked) void AutoPilotTimerFix_III()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
push dword ptr [esp + 0x4]
|
||||
|
|
@ -427,6 +527,23 @@ __declspec(naked) void AutoPilotTimerFix_III()
|
|||
pop ebx
|
||||
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
|
||||
|
|
@ -543,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 )
|
||||
|
|
@ -581,6 +698,7 @@ namespace RemoveDriverStatusFix
|
|||
{
|
||||
// if (m_nStatus != STATUS_WRECKED)
|
||||
// m_nStatus = STATUS_ABANDONED;
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
mov ah, [ecx+0x50]
|
||||
|
|
@ -594,6 +712,21 @@ namespace RemoveDriverStatusFix
|
|||
DontSetStatus:
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -626,6 +759,7 @@ namespace EvasiveDiveFix
|
|||
|
||||
__declspec(naked) static void CalculateAngle_Hook()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
push dword ptr [esi+0x7C]
|
||||
|
|
@ -636,6 +770,19 @@ namespace EvasiveDiveFix
|
|||
mov ecx, ebp
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -648,27 +795,48 @@ 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
|
||||
}
|
||||
#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
|
||||
}
|
||||
#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
|
||||
|
|
@ -678,6 +846,18 @@ namespace NullTerminatedLines
|
|||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -704,6 +884,7 @@ namespace DodoKeyboardControls
|
|||
static void* (*orgFindPlayerVehicle)();
|
||||
__declspec(naked) static void FindPlayerVehicle_DodoCheck()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
call orgFindPlayerVehicle
|
||||
|
|
@ -715,6 +896,21 @@ namespace DodoKeyboardControls
|
|||
CheatDisabled:
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -771,6 +967,7 @@ namespace GenerateNewPickup_ReuseObjectFix
|
|||
|
||||
__declspec(naked) static void GiveUsAPickUpObject_CleanUpObject()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
_asm
|
||||
{
|
||||
mov eax, pPickupObject
|
||||
|
|
@ -796,6 +993,36 @@ namespace GenerateNewPickup_ReuseObjectFix
|
|||
NoPickup:
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1028,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)
|
||||
|
|
@ -1055,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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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(); }
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <d3d9.h>
|
||||
#include <Shlwapi.h>
|
||||
#include <ShlObj.h>
|
||||
#include <ShellAPI.h>
|
||||
#include <shlwapi.h>
|
||||
#include <shlobj.h>
|
||||
#include <shellapi.h>
|
||||
#include <cinttypes>
|
||||
|
||||
#include "ScriptSA.h"
|
||||
|
|
@ -950,7 +950,7 @@ char* GetMyDocumentsPathSA()
|
|||
}
|
||||
|
||||
static LARGE_INTEGER FrameTime;
|
||||
__declspec(safebuffers) int32_t GetTimeSinceLastFrame()
|
||||
NOBUFFERCHECKS int32_t GetTimeSinceLastFrame()
|
||||
{
|
||||
LARGE_INTEGER curTime;
|
||||
QueryPerformanceCounter(&curTime);
|
||||
|
|
@ -2851,7 +2851,7 @@ namespace CreditsScalingFixes
|
|||
static const unsigned int FIXED_RES_HEIGHT_SCALE = 448;
|
||||
|
||||
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_ScaleY(float fX, float fY, const wchar_t* pText)
|
||||
|
|
@ -2888,7 +2888,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)
|
||||
|
|
@ -2898,7 +2898,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)
|
||||
|
|
@ -2915,7 +2915,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)
|
||||
|
|
@ -3960,7 +3960,7 @@ __declspec(naked) void DarkVehiclesFix4()
|
|||
}
|
||||
// 1.0 ONLY ENDS HERE
|
||||
|
||||
__declspec(safebuffers) static int _Timers_ftol_internal( double timer, double& remainder )
|
||||
NOBUFFERCHECKS static int _Timers_ftol_internal( double timer, double& remainder )
|
||||
{
|
||||
double integral;
|
||||
remainder = modf( timer + remainder, &integral );
|
||||
|
|
@ -7680,7 +7680,7 @@ void Patch_SA_NewBinaries_Common(HINSTANCE hInstance)
|
|||
// Fixed escalators crash
|
||||
try
|
||||
{
|
||||
orgEscalatorsUpdate = static_cast<decltype(orgEscalatorsUpdate)>(get_pattern( "80 3D ? ? ? ? ? 74 23 56" ));
|
||||
orgEscalatorsUpdate = reinterpret_cast<decltype(orgEscalatorsUpdate)>(get_pattern( "80 3D ? ? ? ? ? 74 23 56" ));
|
||||
|
||||
auto updateEscalators = get_pattern("80 3D ? ? ? ? ? 74 22 56");
|
||||
auto removeEscalatorsForEntity = pattern( "80 7E F5 00 74 56" ).get_one();
|
||||
|
|
@ -8539,7 +8539,7 @@ void Patch_SA_NewBinaries_Common(HINSTANCE hInstance)
|
|||
ppRWD3D9 = *get_pattern<IDirect3D9**>("33 ED A3 ? ? ? ? 3B C5", 2 + 1);
|
||||
FrontEndMenuManager = *get_pattern<void**>("50 50 68 ? ? ? ? B9 ? ? ? ? E8", 7 + 1); // This has 2 identical matches, we just need one
|
||||
|
||||
orgGetDocumentsPath = static_cast<char*(*)()>(get_pattern( "8D 45 FC 50 68 19 00 02 00", -6 ));
|
||||
orgGetDocumentsPath = reinterpret_cast<char*(*)()>(get_pattern( "8D 45 FC 50 68 19 00 02 00", -6 ));
|
||||
|
||||
Patch(dialogBoxParam, &pDialogBoxParamA_New);
|
||||
Patch(setFocus, &pSetFocus_NOP);
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -671,6 +671,7 @@ float FixedRefValue()
|
|||
|
||||
__declspec(naked) void SubtitlesShadowFix()
|
||||
{
|
||||
#ifdef MSC_VER
|
||||
_asm
|
||||
{
|
||||
mov [esp], eax
|
||||
|
|
@ -683,10 +684,33 @@ __declspec(naked) void 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
|
||||
}
|
||||
|
||||
// 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
|
||||
|
|
@ -694,12 +718,22 @@ __declspec(naked) void CreateInstance_BikeFix()
|
|||
call CVehicleModelInfo::GetExtrasFrame
|
||||
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);
|
||||
|
|
@ -733,6 +767,7 @@ unsigned int __cdecl AutoPilotTimerCalculation_VC(unsigned int nTimer, int nScal
|
|||
|
||||
__declspec(naked) void AutoPilotTimerFix_VC()
|
||||
{
|
||||
#ifdef MSC_VER
|
||||
_asm
|
||||
{
|
||||
push dword ptr [esp + 0xC]
|
||||
|
|
@ -746,6 +781,22 @@ __declspec(naked) void AutoPilotTimerFix_VC()
|
|||
pop ebx
|
||||
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
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -866,6 +917,7 @@ namespace SirenSwitchingFix
|
|||
{
|
||||
__declspec(naked) static void IsFBIRanchOrFBICar()
|
||||
{
|
||||
#ifdef MSC_VER
|
||||
_asm
|
||||
{
|
||||
mov dword ptr [esi+0x1C], 0x1C
|
||||
|
|
@ -882,6 +934,24 @@ namespace SirenSwitchingFix
|
|||
xor al, al
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -950,6 +1020,7 @@ namespace RemoveDriverStatusFix
|
|||
{
|
||||
// if (m_nStatus != STATUS_WRECKED)
|
||||
// m_nStatus = STATUS_ABANDONED;
|
||||
#ifdef MSC_VER
|
||||
_asm
|
||||
{
|
||||
mov cl, [ebx+0x50]
|
||||
|
|
@ -963,6 +1034,21 @@ namespace RemoveDriverStatusFix
|
|||
DontSetStatus:
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1035,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
|
||||
}
|
||||
#else
|
||||
__asm__ volatile
|
||||
(
|
||||
"mov eax, [esp+4]\n"
|
||||
"mov byte ptr [eax+ecx], 0\n"
|
||||
"jmp %[orgSscanf_LoadPath]"
|
||||
:: [orgSscanf_LoadPath] "m" (orgSscanf_LoadPath)
|
||||
);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1065,16 +1161,26 @@ namespace PickupEffectsFixes
|
|||
{
|
||||
__declspec(naked) static void PickUpEffects_BigDollarColor()
|
||||
{
|
||||
#ifdef MSC_VER
|
||||
_asm
|
||||
{
|
||||
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
|
||||
|
|
@ -1090,6 +1196,23 @@ namespace PickupEffectsFixes
|
|||
mov ebx, ecx
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1106,6 +1229,7 @@ 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
|
||||
|
|
@ -1126,6 +1250,31 @@ namespace IsPlayerTargettingCharFix
|
|||
xor al, al
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1211,6 +1360,7 @@ namespace SelectableBackfaceCulling
|
|||
static void* EntityRender_Prologue_JumpBack;
|
||||
__declspec(naked) static void __fastcall EntityRender_Original(CEntity*)
|
||||
{
|
||||
#ifdef MSC_VER
|
||||
_asm
|
||||
{
|
||||
push ebx
|
||||
|
|
@ -1218,6 +1368,16 @@ namespace SelectableBackfaceCulling
|
|||
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)
|
||||
|
|
@ -1393,6 +1553,7 @@ namespace TommyFistShakeWithWeapons
|
|||
|
||||
__declspec(naked) static void CheckWeaponGroupHook()
|
||||
{
|
||||
#ifdef MSC_VER
|
||||
_asm
|
||||
{
|
||||
push dword ptr [eax]
|
||||
|
|
@ -1401,6 +1562,17 @@ namespace TommyFistShakeWithWeapons
|
|||
test al, al
|
||||
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>
|
||||
|
|
@ -1876,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);
|
||||
|
|
@ -2759,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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue