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

fix GetCurrentZoneLockedOrUnlocked regression in 3.0

Browse source
This commit is contained in:
Silent 2017-03-11 15:43:55 +01:00
parent c8eddf93f8
commit cf59b58353
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
SilentPatchSA/SilentPatchSA.cpp
View file

@ -626,11 +626,11 @@ void StartNewMission_SCMFixes()
bool GetCurrentZoneLockedOrUnlocked(float fPosX, float fPosY) bool GetCurrentZoneLockedOrUnlocked(float fPosX, float fPosY)
{ {
// Exploit RAII really bad // Exploit RAII really bad
static const float GridXOffset = **AddressByVersion<float**>(0x572135+2, 0, 0 /*TODO*/), GridYOffset = **AddressByVersion<float**>(0x57214A+2, 0, 0 /*TODO*/); static const float GridXOffset = **(float**)(0x572135+2), GridYOffset = **(float**)(0x57214A+2);
static const float GridXSize = **AddressByVersion<float**>(0x57213B+2, 0, 0 /*TODO*/), GridYSize = **AddressByVersion<float**>(0x572153+2, 0, 0 /*TODO*/); static const float GridXSize = **(float**)(0x57213B+2), GridYSize = **(float**)(0x572153+2);
static const int GridXNum = (2.0f*GridXOffset) * GridXSize, GridYNum = (2.0f*GridYOffset) * GridYSize; static const int GridXNum = (2.0f*GridXOffset) * GridXSize, GridYNum = (2.0f*GridYOffset) * GridYSize;
static unsigned char* const ZonesVisited = *AddressByVersion<unsigned char**>(0x57216A, 0, 0x5870E8) - (GridYNum-1); // 1.01 fixed it! static unsigned char* const ZonesVisited = *(unsigned char**)(0x57216A) - (GridYNum-1); // 1.01 fixed it!
int Xindex = (fPosX+GridXOffset) * GridXSize; int Xindex = (fPosX+GridXOffset) * GridXSize;
int Yindex = (fPosY+GridYOffset) * GridYSize; int Yindex = (fPosY+GridYOffset) * GridYSize;
@ -643,6 +643,21 @@ bool GetCurrentZoneLockedOrUnlocked(float fPosX, float fPosY)
return true; return true;
} }
bool GetCurrentZoneLockedOrUnlocked_Steam(float fPosX, float fPosY)
{
static unsigned char* const ZonesVisited = *(unsigned char**)(0x5870E8) - 9;
int Xindex = (fPosX+3000.0f) / 600.0f;
int Yindex = (fPosY+3000.0f) / 600.0f;
// "Territories fix"
if ( (Xindex >= 0 && Xindex < 10) && (Yindex >= 0 && Yindex < 10) )
return ZonesVisited[10*Xindex - Yindex + 9] != 0;
// Outside of map bounds
return true;
}
// By NTAuthority // By NTAuthority
void DrawMoonWithPhases(int moonColor, float* screenPos, float sizeX, float sizeY) void DrawMoonWithPhases(int moonColor, float* screenPos, float sizeX, float sizeY)
{ {
@ -3531,7 +3546,7 @@ void Patch_SA_Steam()
InjectHook(0x7006BA, &CPlane::Fix_SilentPatch, PATCH_JUMP); InjectHook(0x7006BA, &CPlane::Fix_SilentPatch, PATCH_JUMP);
// Zones fix // Zones fix
InjectHook(0x587080, GetCurrentZoneLockedOrUnlocked, PATCH_JUMP); InjectHook(0x587080, GetCurrentZoneLockedOrUnlocked_Steam, PATCH_JUMP);
// CGarages::RespraysAreFree resetting on new game // CGarages::RespraysAreFree resetting on new game
Patch<WORD>(0x44CB55, 0xC766); Patch<WORD>(0x44CB55, 0xC766);