Mirrors/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2024-11-22 05:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

VC: Scale radardisc to resolution, and shrink it to 4px

Browse Source
This commit is contained in:
Silent 2024-10-04 18:15:35 +02:00
parent 97ebcdbbd5
commit f0b29c8b09
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
7 changed files with 204 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SilentPatch/Common.cpp
View File

@ -84,8 +84,8 @@ namespace StaticShadowAlphaFix
return result; return result;
} }
HOOK_EACH_FUNC(StoreAlphaTest, orgRenderStateSet_StoreAlphaTest, RenderStateSet_StoreAlphaTest); HOOK_EACH_INIT(StoreAlphaTest, orgRenderStateSet_StoreAlphaTest, RenderStateSet_StoreAlphaTest);
HOOK_EACH_FUNC(RestoreAlphaTest, orgRenderStateSet_RestoreAlphaTest, RenderStateSet_RestoreAlphaTest); HOOK_EACH_INIT(RestoreAlphaTest, orgRenderStateSet_RestoreAlphaTest, RenderStateSet_RestoreAlphaTest);
}; };
// ============= Corrected corona placement for taxi ============= // ============= Corrected corona placement for taxi =============

1
SilentPatch/Maths.h
View File

@ -2,6 +2,7 @@
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <math.h> #include <math.h>
#include <cmath>
#include <rwcore.h> #include <rwcore.h>

2
SilentPatch/Utils

@ -1 +1 @@
Subproject commit 58f3f475e6e84dc97f5e2c171e21b928c2c366ab Subproject commit cc5c9df5895e7c0ca0dc087a716f4782635ddcfe

10
SilentPatchIII/SilentPatchIII.cpp
View File

@ -132,7 +132,7 @@ namespace ScalingFixes
orgSetScale<Index>(fX * GetWidthMult() * RsGlobal->MaximumWidth, fY * GetHeightMult() * RsGlobal->MaximumHeight); orgSetScale<Index>(fX * GetWidthMult() * RsGlobal->MaximumWidth, fY * GetHeightMult() * RsGlobal->MaximumHeight);
} }
HOOK_EACH_FUNC(SetScale, orgSetScale, SetScale_Fix); HOOK_EACH_INIT(SetScale, orgSetScale, SetScale_Fix);
} }
class CGang class CGang
@ -428,7 +428,7 @@ static void __fastcall GiveWeapon_SP(void* ped, void*, unsigned int weapon, unsi
{ {
orgGiveWeapon<Index>(ped, nullptr, weapon, std::max(1u, ammo)); orgGiveWeapon<Index>(ped, nullptr, weapon, std::max(1u, ammo));
} }
HOOK_EACH_FUNC(GiveWeapon, orgGiveWeapon, GiveWeapon_SP); HOOK_EACH_INIT(GiveWeapon, orgGiveWeapon, GiveWeapon_SP);
} }
@ -739,7 +739,7 @@ namespace VariableResets
ReInitOurVariables(); ReInitOurVariables();
orgReInitGameObjectVariables<Index>(); orgReInitGameObjectVariables<Index>();
} }
HOOK_EACH_FUNC(ReInitGameObjectVariables, orgReInitGameObjectVariables, ReInitGameObjectVariables); HOOK_EACH_INIT(ReInitGameObjectVariables, orgReInitGameObjectVariables, ReInitGameObjectVariables);
static void (*orgGameInitialise)(const char*); static void (*orgGameInitialise)(const char*);
void GameInitialise(const char* path) void GameInitialise(const char* path)
@ -813,7 +813,7 @@ namespace SitInBoat
orgRegisterReference<Index>(pThis, nullptr, pReference); orgRegisterReference<Index>(pThis, nullptr, pReference);
} }
HOOK_EACH_FUNC(CheckSitInBoat, orgRegisterReference, RegisterReference_CheckSitInBoat); HOOK_EACH_INIT(CheckSitInBoat, orgRegisterReference, RegisterReference_CheckSitInBoat);
template<std::size_t Index> template<std::size_t Index>
static void* (*orgBlendAnimation)(void*, unsigned int, unsigned int, float); static void* (*orgBlendAnimation)(void*, unsigned int, unsigned int, float);
@ -828,7 +828,7 @@ namespace SitInBoat
return orgBlendAnimation<Index>(clump, groupId, animationId, factor); return orgBlendAnimation<Index>(clump, groupId, animationId, factor);
} }
HOOK_EACH_FUNC(BlendAnimation, orgBlendAnimation, BlendAnimation_SitInBoat); HOOK_EACH_INIT(BlendAnimation, orgBlendAnimation, BlendAnimation_SitInBoat);
using FinishCB = void(*)(void*, void*); using FinishCB = void(*)(void*, void*);
static void __fastcall FinishCallback_CallImmediately(void*, void*, FinishCB cb, Ped* ped) static void __fastcall FinishCallback_CallImmediately(void*, void*, FinishCB cb, Ped* ped)

14
SilentPatchSA/SilentPatchSA.cpp
View File

@ -770,7 +770,7 @@ static void WipeLocalVariableMemoryForMissionScript_ApplyFixes()
StartNewMission_SCMFixes(); StartNewMission_SCMFixes();
} }
HOOK_EACH_FUNC(SCMFixes, orgWipeLocalVariableMemoryForMissionScript, WipeLocalVariableMemoryForMissionScript_ApplyFixes) HOOK_EACH_INIT(SCMFixes, orgWipeLocalVariableMemoryForMissionScript, WipeLocalVariableMemoryForMissionScript_ApplyFixes)
} }
@ -979,7 +979,7 @@ static RwUInt32 GetMaxMultiSamplingLevels()
{ {
return GetMaxMultiSamplingLevels_BitScan(orgGetMaxMultiSamplingLevels<Index>()); return GetMaxMultiSamplingLevels_BitScan(orgGetMaxMultiSamplingLevels<Index>());
} }
HOOK_EACH_FUNC(GetMaxMultiSamplingLevels, orgGetMaxMultiSamplingLevels, GetMaxMultiSamplingLevels); HOOK_EACH_INIT(GetMaxMultiSamplingLevels, orgGetMaxMultiSamplingLevels, GetMaxMultiSamplingLevels);
template<typename std::size_t Index> template<typename std::size_t Index>
static void (*orgSetOrChangeMultiSamplingLevels)(RwUInt32); static void (*orgSetOrChangeMultiSamplingLevels)(RwUInt32);
@ -989,7 +989,7 @@ static void SetOrChangeMultiSamplingLevels(RwUInt32 level)
{ {
orgSetOrChangeMultiSamplingLevels<Index>( 1 << (level - 1) ); orgSetOrChangeMultiSamplingLevels<Index>( 1 << (level - 1) );
} }
HOOK_EACH_FUNC(SetOrChangeMultiSamplingLevels, orgSetOrChangeMultiSamplingLevels, SetOrChangeMultiSamplingLevels); HOOK_EACH_INIT(SetOrChangeMultiSamplingLevels, orgSetOrChangeMultiSamplingLevels, SetOrChangeMultiSamplingLevels);
void MSAAText( char* buffer, const char*, DWORD level ) void MSAAText( char* buffer, const char*, DWORD level )
{ {
@ -1038,7 +1038,7 @@ static void* CollisionData_NewAndInit(size_t size)
return mem; return mem;
} }
HOOK_EACH_FUNC(CollisionDataNew, orgNewAlloc, CollisionData_NewAndInit); HOOK_EACH_INIT(CollisionDataNew, orgNewAlloc, CollisionData_NewAndInit);
} }
@ -1722,7 +1722,7 @@ namespace VariableResets
// Then after the normal restart, re-instate pickups, car generators and stunt jumps from text IPLs as they have been // Then after the normal restart, re-instate pickups, car generators and stunt jumps from text IPLs as they have been
ReloadObjectDefinitionsAfterReinit(); ReloadObjectDefinitionsAfterReinit();
} }
HOOK_EACH_FUNC(ReInitGameObjectVariables, orgReInitGameObjectVariables, ReInitGameObjectVariables); HOOK_EACH_INIT(ReInitGameObjectVariables, orgReInitGameObjectVariables, ReInitGameObjectVariables);
} }
namespace LightbeamFix namespace LightbeamFix
@ -2279,7 +2279,7 @@ namespace RestrictImpoundVehicleTypes
return vehicle->CanThisVehicleBeImpounded() && orgIsThisVehicleInteresting<Index>(vehicle); return vehicle->CanThisVehicleBeImpounded() && orgIsThisVehicleInteresting<Index>(vehicle);
} }
HOOK_EACH_FUNC(ShouldImpound, orgIsThisVehicleInteresting, IsThisVehicleInteresting_AndCanBeImpounded) HOOK_EACH_INIT(ShouldImpound, orgIsThisVehicleInteresting, IsThisVehicleInteresting_AndCanBeImpounded)
} }
@ -2536,7 +2536,7 @@ namespace Rand16bit
return bottomBits | topBit; return bottomBits | topBit;
} }
HOOK_EACH_FUNC(Rand, orgRand, rand16bit); HOOK_EACH_INIT(Rand, orgRand, rand16bit);
} }

8
SilentPatchSA/VehicleSA.h
View File

@ -313,7 +313,7 @@ private:
} }
public: public:
HOOK_EACH_FUNC(DoHeadLightBeam, orgDoHeadLightBeam, &DoHeadLightBeam_LightBeamFixSaveObj); HOOK_EACH_INIT(DoHeadLightBeam, orgDoHeadLightBeam, &DoHeadLightBeam_LightBeamFixSaveObj);
}; };
class NOVMT CAutomobile : public CVehicle class NOVMT CAutomobile : public CVehicle
@ -347,7 +347,7 @@ public:
AfterPreRender(); AfterPreRender();
} }
HOOK_EACH_FUNC(PreRender, orgAutomobilePreRender, &PreRender_SilentPatch); HOOK_EACH_INIT(PreRender, orgAutomobilePreRender, &PreRender_SilentPatch);
void HideDestroyedWheels_SilentPatch(void (CAutomobile::*spawnFlyingComponentCB)(int, unsigned int), int nodeID, unsigned int modelID); void HideDestroyedWheels_SilentPatch(void (CAutomobile::*spawnFlyingComponentCB)(int, unsigned int), int nodeID, unsigned int modelID);
@ -360,7 +360,7 @@ public:
HideDestroyedWheels_SilentPatch(orgSpawnFlyingComponent<Index>, nodeID, modelID); HideDestroyedWheels_SilentPatch(orgSpawnFlyingComponent<Index>, nodeID, modelID);
} }
HOOK_EACH_FUNC(SpawnFlyingComponent, orgSpawnFlyingComponent, &SpawnFlyingComponent_HideWheels); HOOK_EACH_INIT(SpawnFlyingComponent, orgSpawnFlyingComponent, &SpawnFlyingComponent_HideWheels);
void Fix_SilentPatch(); void Fix_SilentPatch();
RwFrame* GetTowBarFrame() const; RwFrame* GetTowBarFrame() const;
@ -457,7 +457,7 @@ private:
} }
public: public:
HOOK_EACH_FUNC(RestoreCar, orgRestoreCar, &RestoreCar_SilentPatch); HOOK_EACH_INIT(RestoreCar, orgRestoreCar, &RestoreCar_SilentPatch);
private: private:
CVehicle* RestoreCar_LoadBombOwnership(CVehicle* vehicle); CVehicle* RestoreCar_LoadBombOwnership(CVehicle* vehicle);

188
SilentPatchVC/SilentPatchVC.cpp
View File

@ -190,6 +190,96 @@ namespace PrintStringShadows
Memory::DynBase::InterceptCall(addr, orgPrintString, PrintString); Memory::DynBase::InterceptCall(addr, orgPrintString, PrintString);
} }
}; };
// Radar position and radardisc shadow
static const float RADARDISC_SHRINK = 2.0f; // We are shrinking the radardisc by that
template<std::size_t Index>
static const float* orgRadarXPos;
template<std::size_t Index>
static float RadarXPos_Recalculated;
template<std::size_t... I>
static void RecalculateXPositions(std::index_sequence<I...>)
{
const float multiplier = GetWidthMult() * RsGlobal->MaximumWidth;
((RadarXPos_Recalculated<I> = *orgRadarXPos<I> * multiplier), ...);
}
template<std::size_t Index>
static const float* orgRadarYPos;
template<std::size_t Index>
static float RadarYPos_Recalculated;
template<std::size_t... I>
static void RecalculateYPositions(std::index_sequence<I...>)
{
const float multiplier = GetHeightMult() * RsGlobal->MaximumHeight;
((RadarYPos_Recalculated<I> = *orgRadarYPos<I> * multiplier), ...);
}
template<std::size_t Index>
static const float* orgRadarXPos_RadardiscShrink;
template<std::size_t Index>
static float RadarXPos_Recalculated_RadardiscShrink;
template<std::size_t... I>
static void RecalculateXPositions_RadardiscShrink(std::index_sequence<I...>)
{
const float multiplier = GetWidthMult() * RsGlobal->MaximumWidth;
((RadarXPos_Recalculated_RadardiscShrink<I> = (*orgRadarXPos_RadardiscShrink<I> - RADARDISC_SHRINK) * multiplier), ...);
}
template<std::size_t Index>
static const float* orgRadarYPos_RadardiscShrink;
template<std::size_t Index>
static float RadarYPos_Recalculated_RadardiscShrink;
template<std::size_t... I>
static void RecalculateYPositions_RadardiscShrink(std::index_sequence<I...>)
{
const float multiplier = GetHeightMult() * RsGlobal->MaximumHeight;
((RadarYPos_Recalculated_RadardiscShrink<I> = (*orgRadarYPos_RadardiscShrink<I> - RADARDISC_SHRINK) * multiplier), ...);
}
static void (*orgDrawMap)();
template<std::size_t NumXPos, std::size_t NumYPos, std::size_t NumXPosRadardisc, std::size_t NumYPosRadardisc>
static void DrawMap_RecalculatePositions()
{
RecalculateXPositions(std::make_index_sequence<NumXPos>{});
RecalculateYPositions(std::make_index_sequence<NumYPos>{});
RecalculateXPositions_RadardiscShrink(std::make_index_sequence<NumXPosRadardisc>{});
RecalculateYPositions_RadardiscShrink(std::make_index_sequence<NumYPosRadardisc>{});
orgDrawMap();
}
HOOK_EACH_INIT(CalculateRadarXPos, orgRadarXPos, RadarXPos_Recalculated);
HOOK_EACH_INIT(CalculateRadarYPos, orgRadarYPos, RadarYPos_Recalculated);
HOOK_EACH_INIT(CalculateRadarXPos_RadardiscShrink, orgRadarXPos_RadardiscShrink, RadarXPos_Recalculated_RadardiscShrink);
HOOK_EACH_INIT(CalculateRadarYPos_RadardiscShrink, orgRadarYPos_RadardiscShrink, RadarYPos_Recalculated_RadardiscShrink);
static CRect ScaleWidthRect(CRect rect)
{
// Also account for a smaller radardisc
rect.x1 = (rect.x1 + RADARDISC_SHRINK) * GetWidthMult() * RsGlobal->MaximumWidth;
return rect;
}
template<std::size_t Index>
static void (__fastcall* orgDrawSprite)(void* obj, void*, const CRect& rect, const CRGBA& col1, const CRGBA& col2, const CRGBA& col3, const CRGBA& col4);
template<std::size_t Index>
static void __fastcall DrawSprite_Scale(void* obj, void*, const CRect& rect, const CRGBA& col1, const CRGBA& col2, const CRGBA& col3, const CRGBA& col4)
{
orgDrawSprite<Index>(obj, nullptr, ScaleWidthRect(rect), col1, col2, col3, col4);
}
HOOK_EACH_INIT(DrawRadarDisc, orgDrawSprite, DrawSprite_Scale);
} }
float FixedRefValue() float FixedRefValue()
@ -287,7 +377,7 @@ static void __fastcall GiveWeapon_SP(void* ped, void*, unsigned int weapon, unsi
{ {
orgGiveWeapon<Index>(ped, nullptr, weapon, std::max(1u, ammo), flag); orgGiveWeapon<Index>(ped, nullptr, weapon, std::max(1u, ammo), flag);
} }
HOOK_EACH_FUNC(GiveWeapon, orgGiveWeapon, GiveWeapon_SP); HOOK_EACH_INIT(GiveWeapon, orgGiveWeapon, GiveWeapon_SP);
} }
@ -681,7 +771,7 @@ namespace VariableResets
ReInitOurVariables(); ReInitOurVariables();
orgReInitGameObjectVariables<Index>(); orgReInitGameObjectVariables<Index>();
} }
HOOK_EACH_FUNC(ReInitGameObjectVariables, orgReInitGameObjectVariables, ReInitGameObjectVariables); HOOK_EACH_INIT(ReInitGameObjectVariables, orgReInitGameObjectVariables, ReInitGameObjectVariables);
static void (*orgGameInitialise)(const char*); static void (*orgGameInitialise)(const char*);
void GameInitialise(const char* path) void GameInitialise(const char* path)
@ -845,7 +935,7 @@ namespace ConstructionSiteLODFix
FixConstructionSiteModel(oldModelID, newModelID); FixConstructionSiteModel(oldModelID, newModelID);
} }
HOOK_EACH_FUNC(ReplaceWithNewModel, orgReplaceWithNewModel, ReplaceWithNewModel_ConstructionSiteFix); HOOK_EACH_INIT(ReplaceWithNewModel, orgReplaceWithNewModel, ReplaceWithNewModel_ConstructionSiteFix);
} }
@ -936,7 +1026,7 @@ namespace TommyFistShakeWithWeapons
return orgGetWeaponInfo<Index>(weaponID); return orgGetWeaponInfo<Index>(weaponID);
} }
HOOK_EACH_FUNC(ExcludeChainsaw, orgGetWeaponInfo, gGetWeaponInfo_ExcludeChainsaw); HOOK_EACH_INIT(ExcludeChainsaw, orgGetWeaponInfo, gGetWeaponInfo_ExcludeChainsaw);
} }
@ -947,6 +1037,8 @@ void InjectDelayedPatches_VC_Common( bool bHasDebugMenu, const wchar_t* wcModule
const ModuleList moduleList; const ModuleList moduleList;
const HMODULE hGameModule = GetModuleHandle(nullptr);
const HMODULE skygfxModule = moduleList.Get(L"skygfx"); const HMODULE skygfxModule = moduleList.Get(L"skygfx");
if (skygfxModule != nullptr) if (skygfxModule != nullptr)
{ {
@ -1130,6 +1222,94 @@ void InjectDelayedPatches_VC_Common( bool bHasDebugMenu, const wchar_t* wcModule
TXN_CATCH(); TXN_CATCH();
// Fix the radar disc shadow scaling and radar X position
try
{
// Legacy namespace name, it's OK
using namespace PrintStringShadows;
auto draw_entity_coord_blip = pattern("D8 0D ? ? ? ? D8 05 ? ? ? ? DE C1 D9 5C 24 18").count(2);
auto draw_radar_disc1 = pattern("D8 25 ? ? ? ? DD DB D9 C2 D9 9C 24 ? ? ? ? DB 05 ? ? ? ? D8 0D ? ? ? ? D8 0D ? ? ? ? D8 05 ? ? ? ? D8 05").count(2);
auto draw_radar_disc2 = pattern("D8 C1 D8 05 ? ? ? ? D9 9C 24 ? ? ? ? DE D9 DD D8").count(2);
std::array<float**, 8> radarXPos = {
get_pattern<float*>("D8 05 ? ? ? ? DE C1 D9 5C 24 28", 2),
get_pattern<float*>("D8 05 ? ? ? ? DE C1 D9 5C EC 30", 2),
get_pattern<float*>("D8 0D ? ? ? ? D8 05 ? ? ? ? DE C1 D9 9C C4", 6 + 2),
get_pattern<float*>("D8 0D ? ? ? ? D8 05 ? ? ? ? DE C1 D9 5C 24 08", 6 + 2),
get_pattern<float*>("D8 0D ? ? ? ? D8 05 ? ? ? ? DE C1 DD D9 DB 44 24 18", 6 + 2),
get_pattern<float*>("D8 0D ? ? ? ? D8 05 ? ? ? ? DE C1 DD DB DB 44 24 18", 6 + 2),
draw_entity_coord_blip.get(0).get<float*>(6 + 2),
draw_entity_coord_blip.get(1).get<float*>(6 + 2),
};
std::array<float**, 4> radarXPos_RadardiscShrink = {
draw_radar_disc1.get(0).get<float*>(35 + 2),
draw_radar_disc1.get(0).get<float*>(35 + 6 + 2),
draw_radar_disc1.get(1).get<float*>(35 + 2),
draw_radar_disc1.get(1).get<float*>(35 + 6 + 2),
};
std::array<float**, 4> radarYPos_RadardiscShrink = {
draw_radar_disc1.get(0).get<float*>(2),
draw_radar_disc1.get(1).get<float*>(2),
draw_radar_disc2.get(0).get<float*>(2 + 2),
draw_radar_disc2.get(1).get<float*>(2 + 2),
};
auto drawMap = get_pattern("59 E8 ? ? ? ? 83 3D ? ? ? ? ? 0F 84", 1);
auto drawRadarDiscSprite = pattern("D8 05 ? ? ? ? D9 9C 24 ? ? ? ? DE D9 DD D8 E8").count(2);
std::array<void*, 2> spriteDraw = {
drawRadarDiscSprite.get(0).get<void>(17),
drawRadarDiscSprite.get(1).get<void>(17),
};
// Undo the damage caused by IVRadarScaling from the widescreen fix moving the radar way too far to the right
// It's moved from 40.0f to 71.0f, which is way too much now that we're scaling the horizontal placement correctly!
try
{
// Use exactly the same patterns as widescreen fix
float* radarPos = *get_pattern<float*>("D8 05 ? ? ? ? DE C1 D9 5C 24 28", 2);
// No need to undo CRadar::DrawYouAreHereSprite, as wsfix keeps it as 40.0f
// This hardcodes a patched constant inside so the pattern will fail to match without IV radar scaling
auto radarRing1 = pattern("C7 84 24 ? ? ? ? 00 00 82 42").count(2);
auto radarRing2 = pattern("D8 05 ? ? ? ? D8 05 ? ? ? ? D9 9C 24").count(2);
// This + radarRing1 succeeding is enough proof that IVRadarScaling is in use
if (hGameModule == ModCompat::Utils::GetModuleHandleFromAddress(radarPos) && *radarPos == (40.0f + 31.0f))
{
*radarPos = 40.0f;
radarRing1.for_each_result([](pattern_match match)
{
Patch<float>(match.get<void>(7), 34.0f);
});
radarRing2.for_each_result([](pattern_match match)
{
static float STOCK_RADAR_POS = 40.0f;
Patch(match.get<void>(2), &STOCK_RADAR_POS);
});
}
}
TXN_CATCH();
auto PatchFloat = [](float** address, const float*& org, float& replaced)
{
org = *address;
Patch(address, &replaced);
};
HookEach_CalculateRadarXPos(radarXPos, PatchFloat);
HookEach_CalculateRadarXPos_RadardiscShrink(radarXPos_RadardiscShrink, PatchFloat);
HookEach_CalculateRadarYPos_RadardiscShrink(radarYPos_RadardiscShrink, PatchFloat);
HookEach_DrawRadarDisc(spriteDraw, InterceptCall);
InterceptCall(drawMap, orgDrawMap, DrawMap_RecalculatePositions<radarXPos.size(), 0, radarXPos_RadardiscShrink.size(), radarYPos_RadardiscShrink.size()>);
}
TXN_CATCH();
FLAUtils::Init(moduleList); FLAUtils::Init(moduleList);
} }