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

Fixup (tested live)

Browse source
This commit is contained in:
Silent 2018-02-09 23:40:11 +01:00
parent 10caf7e242
commit bcdf773db4
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
SilentPatch/MemoryMgr.h
View file

@ -37,13 +37,18 @@ enum
namespace Memory namespace Memory
{ {
struct PatternAndRange struct PatternAndOffset
{ {
PatternAndOffset( std::string_view pattern, ptrdiff_t offset = 0 )
: pattern(std::move(pattern)), offset(offset)
{
}
std::string_view pattern; std::string_view pattern;
ptrdiff_t offset; ptrdiff_t offset;
}; };
using AddrVariant = std::variant<uintptr_t, PatternAndRange>; using AddrVariant = std::variant<uintptr_t, PatternAndOffset>;
namespace internal namespace internal
{ {
@ -77,7 +82,7 @@ namespace Memory
{ {
namespace internal namespace internal
{ {
inline uintptr_t HandlePattern( const PatternAndRange& pattern ) inline uintptr_t HandlePattern( const PatternAndOffset& pattern )
{ {
void* addr = hook::get_pattern( pattern.pattern, pattern.offset ); void* addr = hook::get_pattern( pattern.pattern, pattern.offset );
return reinterpret_cast<uintptr_t>(addr); return reinterpret_cast<uintptr_t>(addr);
@ -274,7 +279,7 @@ namespace Memory
switch ( bVer ) switch ( bVer )
{ {
case 1: case 1:
if ( std::holds_alternative<PatternAndRange>(address11) ) return HandlePattern( std::get<PatternAndRange>(address11) ); if ( std::holds_alternative<PatternAndOffset>(address11) ) return HandlePattern( std::get<PatternAndOffset>(address11) );
else else
{ {
const uintptr_t addr = std::get<uintptr_t>(address11); const uintptr_t addr = std::get<uintptr_t>(address11);
@ -290,7 +295,7 @@ namespace Memory
return AdjustAddress_11(addr); return AdjustAddress_11(addr);
} }
case 2: case 2:
if ( std::holds_alternative<PatternAndRange>(addressSteam) ) return HandlePattern( std::get<PatternAndRange>(addressSteam) ); if ( std::holds_alternative<PatternAndOffset>(addressSteam) ) return HandlePattern( std::get<PatternAndOffset>(addressSteam) );
else else
{ {
const uintptr_t addr = std::get<uintptr_t>(addressSteam); const uintptr_t addr = std::get<uintptr_t>(addressSteam);
@ -306,7 +311,7 @@ namespace Memory
case 3: case 3:
return GetDummy(); return GetDummy();
case 4: case 4:
if ( std::holds_alternative<PatternAndRange>(addressNewsteamR2) ) return HandlePattern( std::get<PatternAndRange>(addressNewsteamR2) ); if ( std::holds_alternative<PatternAndOffset>(addressNewsteamR2) ) return HandlePattern( std::get<PatternAndOffset>(addressNewsteamR2) );
else else
{ {
const uintptr_t addr = std::get<uintptr_t>(addressNewsteamR2); const uintptr_t addr = std::get<uintptr_t>(addressNewsteamR2);
@ -319,7 +324,7 @@ namespace Memory
return DynBaseAddress(addr); return DynBaseAddress(addr);
} }
case 5: case 5:
if ( std::holds_alternative<PatternAndRange>(addressNewsteamR2_LV) ) return HandlePattern( std::get<PatternAndRange>(addressNewsteamR2_LV) ); if ( std::holds_alternative<PatternAndOffset>(addressNewsteamR2_LV) ) return HandlePattern( std::get<PatternAndOffset>(addressNewsteamR2_LV) );
else else
{ {
const uintptr_t addr = std::get<uintptr_t>(addressNewsteamR2_LV); const uintptr_t addr = std::get<uintptr_t>(addressNewsteamR2_LV);
@ -332,7 +337,7 @@ namespace Memory
return DynBaseAddress(addr); return DynBaseAddress(addr);
} }
default: default:
if ( std::holds_alternative<PatternAndRange>(address10) ) return HandlePattern( std::get<PatternAndRange>(address10) ); if ( std::holds_alternative<PatternAndOffset>(address10) ) return HandlePattern( std::get<PatternAndOffset>(address10) );
else else
{ {
const uintptr_t addr = std::get<uintptr_t>(address10); const uintptr_t addr = std::get<uintptr_t>(address10);
@ -371,7 +376,7 @@ namespace Memory
#if defined _GTA_III || defined _GTA_VC #if defined _GTA_III || defined _GTA_VC
inline uintptr_t AddressByVersion(Memory::AddrVariant address10, Memory::AddrVariant address11, Memory::AddrVariant addressSteam) inline uintptr_t AddressByVersion(AddrVariant address10, AddrVariant address11, AddrVariant addressSteam)
{ {
InitializeVersions(); InitializeVersions();
@ -380,7 +385,7 @@ namespace Memory
switch ( bVer ) switch ( bVer )
{ {
case 1: case 1:
if ( std::holds_alternative<PatternAndRange>(address11) ) return HandlePattern( std::get<PatternAndRange>(address11) ); if ( std::holds_alternative<PatternAndOffset>(address11) ) return HandlePattern( std::get<PatternAndOffset>(address11) );
else else
{ {
const uintptr_t addr = std::get<uintptr_t>(address11); const uintptr_t addr = std::get<uintptr_t>(address11);
@ -390,7 +395,7 @@ namespace Memory
return addr; return addr;
} }
case 2: case 2:
if ( std::holds_alternative<PatternAndRange>(addressSteam) ) return HandlePattern( std::get<PatternAndRange>(addressSteam) ); if ( std::holds_alternative<PatternAndOffset>(addressSteam) ) return HandlePattern( std::get<PatternAndOffset>(addressSteam) );
else else
{ {
const uintptr_t addr = std::get<uintptr_t>(addressSteam); const uintptr_t addr = std::get<uintptr_t>(addressSteam);
@ -400,7 +405,7 @@ namespace Memory
return addr; return addr;
} }
default: default:
if ( std::holds_alternative<PatternAndRange>(address10) ) return HandlePattern( std::get<PatternAndRange>(address10) ); if ( std::holds_alternative<PatternAndOffset>(address10) ) return HandlePattern( std::get<PatternAndOffset>(address10) );
else else
{ {
const uintptr_t addr = std::get<uintptr_t>(address10); const uintptr_t addr = std::get<uintptr_t>(address10);