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

III/VC don't need addrvariants

Browse source
This commit is contained in:
Silent 2018-02-10 10:56:00 +01:00
parent cfee0477ca
commit 9854f2235a
1 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
SilentPatch/MemoryMgr.h
View file

@ -376,7 +376,7 @@ namespace Memory
#if defined _GTA_III || defined _GTA_VC #if defined _GTA_III || defined _GTA_VC
inline uintptr_t AddressByVersion(AddrVariant address10, AddrVariant address11, AddrVariant addressSteam) inline uintptr_t AddressByVersion(uintptr_t address10, uintptr_t address11, uintptr_t addressSteam)
{ {
InitializeVersions(); InitializeVersions();
@ -385,35 +385,20 @@ namespace Memory
switch ( bVer ) switch ( bVer )
{ {
case 1: case 1:
if ( std::holds_alternative<PatternAndOffset>(address11) ) return HandlePattern( std::get<PatternAndOffset>(address11) );
else
{
const uintptr_t addr = std::get<uintptr_t>(address11);
#ifdef assert #ifdef assert
assert(addr); assert(address11);
#endif #endif
return addr; return address11;
}
case 2: case 2:
if ( std::holds_alternative<PatternAndOffset>(addressSteam) ) return HandlePattern( std::get<PatternAndOffset>(addressSteam) );
else
{
const uintptr_t addr = std::get<uintptr_t>(addressSteam);
#ifdef assert #ifdef assert
assert(addr); assert(addressSteam);
#endif #endif
return addr; return addressSteam;
}
default: default:
if ( std::holds_alternative<PatternAndOffset>(address10) ) return HandlePattern( std::get<PatternAndOffset>(address10) );
else
{
const uintptr_t addr = std::get<uintptr_t>(address10);
#ifdef assert #ifdef assert
assert(addr); assert(address10);
#endif #endif
return addr; return address10;
}
} }
} }
@ -425,7 +410,7 @@ namespace Memory
#if defined _GTA_III || defined _GTA_VC #if defined _GTA_III || defined _GTA_VC
template<typename T> template<typename T>
inline T AddressByVersion(Memory::AddrVariant address10, Memory::AddrVariant address11, Memory::AddrVariant addressSteam) inline T AddressByVersion(uintptr_t address10, uintptr_t address11, uintptr_t addressSteam)
{ {
return T(Memory::internal::AddressByVersion( address10, address11, addressSteam )); return T(Memory::internal::AddressByVersion( address10, address11, addressSteam ));
} }