jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2025-01-01 16:53:01 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't patch moonphases if skygfx already does that

Browse source
This commit is contained in:
Silent 2017-09-21 17:43:32 +02:00
parent ab6f2609d8
commit 4fbd372d57
1 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
SilentPatchSA/SilentPatchSA.cpp
View file

@ -1362,6 +1362,32 @@ static void CdStreamInitThread()
} }
// ============= Mod compatibility stuff =============
namespace ModCompat
{
bool SkygfxPatchesMoonphases( HMODULE module )
{
if ( module == nullptr ) return false; // SkyGfx not installed
struct Config
{
uint32_t version;
// The rest isn't relevant at the moment
};
auto func = (Config*(*)())GetProcAddress( module, "GetConfig" );
if ( func == nullptr ) return false; // Old version?
const Config* config = func();
if ( config == nullptr ) return false; // Old version/error?
constexpr uint32_t SKYGFX_VERSION_WITH_MOONPHASES = 0x360;
return config->version >= SKYGFX_VERSION_WITH_MOONPHASES;
}
}
#if MEM_VALIDATORS #if MEM_VALIDATORS
#include <intrin.h> #include <intrin.h>
@ -2514,12 +2540,14 @@ BOOL InjectDelayedPatches_10()
GetModuleFileNameW(hDLLModule, wcModulePath, _countof(wcModulePath) - 3); // Minus max required space for extension GetModuleFileNameW(hDLLModule, wcModulePath, _countof(wcModulePath) - 3); // Minus max required space for extension
PathRenameExtensionW(wcModulePath, L".ini"); PathRenameExtensionW(wcModulePath, L".ini");
bool bHasImVehFt = GetASIModuleHandleW(L"ImVehFt") != nullptr; const bool bHasImVehFt = GetASIModuleHandleW(L"ImVehFt") != nullptr;
bool bSAMP = GetModuleHandleW(L"samp") != nullptr; const bool bSAMP = GetModuleHandleW(L"samp") != nullptr;
bool bSARender = GetASIModuleHandleW(L"SARender") != nullptr; const bool bSARender = GetASIModuleHandleW(L"SARender") != nullptr;
const HMODULE skygfxModule = GetASIModuleHandle( TEXT("skygfx") );
ReadRotorFixExceptions(wcModulePath); ReadRotorFixExceptions(wcModulePath);
bool bHookDoubleRwheels = ReadDoubleRearWheels(wcModulePath); const bool bHookDoubleRwheels = ReadDoubleRearWheels(wcModulePath);
#ifndef NDEBUG #ifndef NDEBUG
const bool bHasDebugMenu = DebugMenuLoad(); const bool bHasDebugMenu = DebugMenuLoad();
@ -2797,6 +2825,12 @@ BOOL InjectDelayedPatches_10()
} }
#endif #endif
// Moonphases
// Not taking effect with new skygfx since aap has it too now
if ( !ModCompat::SkygfxPatchesMoonphases( skygfxModule ) )
{
InjectHook(0x713ACB, HandleMoonStuffStub, PATCH_JUMP);
}
FLAUtils::Init(); FLAUtils::Init();
@ -3356,8 +3390,6 @@ void Patch_SA_10()
// Only 1.0 and Steam // Only 1.0 and Steam
Nop(0x57DC55, 2); Nop(0x57DC55, 2);
// Moonphases
InjectHook(0x713ACB, HandleMoonStuffStub, PATCH_JUMP);
// TEMP // TEMP
//Patch<DWORD>(0x733B05, 40); //Patch<DWORD>(0x733B05, 40);