2015-04-22 15:20:40 +02:00
|
|
|
#include "StdAfxSA.h"
|
|
|
|
#include <limits>
|
2016-11-12 18:28:46 +01:00
|
|
|
#include <algorithm>
|
2017-03-02 21:59:06 +01:00
|
|
|
#include <d3d9.h>
|
|
|
|
#include <Shlwapi.h>
|
|
|
|
#include <ShlObj.h>
|
2017-09-28 23:48:08 +02:00
|
|
|
#include <ShellAPI.h>
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
#include "ScriptSA.h"
|
|
|
|
#include "GeneralSA.h"
|
|
|
|
#include "ModelInfoSA.h"
|
|
|
|
#include "VehicleSA.h"
|
|
|
|
#include "PedSA.h"
|
|
|
|
#include "AudioHardwareSA.h"
|
|
|
|
#include "LinkListSA.h"
|
|
|
|
#include "PNGFile.h"
|
2018-01-11 21:45:59 +01:00
|
|
|
#include "PlayerInfoSA.h"
|
2018-02-17 13:59:44 +01:00
|
|
|
#include "FireManagerSA.h"
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-03-02 00:40:55 +01:00
|
|
|
#include "WaveDecoderSA.h"
|
|
|
|
#include "FLACDecoderSA.h"
|
|
|
|
|
2017-03-05 23:05:02 +01:00
|
|
|
#include "Patterns.h"
|
2017-03-25 13:46:07 +01:00
|
|
|
#include "DelimStringReader.h"
|
2017-10-03 21:03:23 +02:00
|
|
|
#include "ModuleList.hpp"
|
2017-03-05 23:05:02 +01:00
|
|
|
|
2017-09-19 21:40:48 +02:00
|
|
|
#include "debugmenu_public.h"
|
2017-12-30 12:37:30 +01:00
|
|
|
#include "resource.h"
|
2017-09-19 21:40:48 +02:00
|
|
|
|
2017-09-23 13:21:10 +02:00
|
|
|
// ============= 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;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool bCdStreamFallBackForOldML = false;
|
|
|
|
bool ModloaderCdStreamRaceConditionAware( HMODULE module )
|
|
|
|
{
|
|
|
|
if ( module == nullptr ) return false; // modloader not installed
|
|
|
|
|
|
|
|
HMODULE stdStreamModule = nullptr;
|
|
|
|
GetModuleHandleEx( 0, TEXT("std.stream.dll"), &stdStreamModule );
|
|
|
|
if ( stdStreamModule == nullptr ) return false; // std.data not loaded
|
|
|
|
|
|
|
|
// ML is installed, so if it's an old version we need to fall back to a less safe implementation (no condition variables)
|
|
|
|
bCdStreamFallBackForOldML = true;
|
|
|
|
|
|
|
|
bool aware = false;
|
|
|
|
const auto func = (uint32_t(*)())GetProcAddress( stdStreamModule, "CdStreamRaceConditionAware" );
|
|
|
|
if ( func != nullptr )
|
|
|
|
{
|
|
|
|
aware = func() >= 1;
|
|
|
|
}
|
|
|
|
FreeLibrary( stdStreamModule );
|
|
|
|
return aware;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-02 19:41:50 +02:00
|
|
|
#pragma warning(disable:4733)
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// RW wrappers
|
|
|
|
static void* varAtomicDefaultRenderCallBack = AddressByVersion<void*>(0x7491C0, 0x749AD0, 0x783180);
|
|
|
|
WRAPPER RpAtomic* AtomicDefaultRenderCallBack(RpAtomic* atomic) { WRAPARG(atomic); VARJMP(varAtomicDefaultRenderCallBack); }
|
|
|
|
static void* varRtPNGImageRead = AddressByVersion<void*>(0x7CF9B0, 0x7D02B0, 0x809970);
|
|
|
|
WRAPPER RwImage* RtPNGImageRead(const RwChar* imageName) { WRAPARG(imageName); VARJMP(varRtPNGImageRead); }
|
|
|
|
static void* varRwTextureCreate = AddressByVersion<void*>(0x7F37C0, 0x7F40C0, 0x82D780);
|
|
|
|
WRAPPER RwTexture* RwTextureCreate(RwRaster* raster) { WRAPARG(raster); VARJMP(varRwTextureCreate); }
|
2016-03-31 20:45:49 +02:00
|
|
|
static void* varRwRasterCreate = AddressByVersion<void*>(0x7FB230, 0x7FBB30, 0x8351F0, 0x82FA80, 0x82F950);
|
2015-04-22 15:20:40 +02:00
|
|
|
WRAPPER RwRaster* RwRasterCreate(RwInt32 width, RwInt32 height, RwInt32 depth, RwInt32 flags) { WRAPARG(width); WRAPARG(height); WRAPARG(depth); WRAPARG(flags); VARJMP(varRwRasterCreate); }
|
|
|
|
static void* varRwImageDestroy = AddressByVersion<void*>(0x802740, 0x803040, 0x83C700);
|
|
|
|
WRAPPER RwBool RwImageDestroy(RwImage* image) { WRAPARG(image); VARJMP(varRwImageDestroy); }
|
|
|
|
static void* varRpMaterialSetTexture = AddressByVersion<void*>(0x74DBC0, 0x74E4D0, 0x787B80);
|
|
|
|
WRAPPER RpMaterial* RpMaterialSetTexture(RpMaterial* material, RwTexture* texture) { VARJMP(varRpMaterialSetTexture); }
|
|
|
|
static void* varRwFrameGetLTM = AddressByVersion<void*>(0x7F0990, 0x7F1290, 0x82A950);
|
|
|
|
WRAPPER RwMatrix* RwFrameGetLTM(RwFrame* frame) { VARJMP(varRwFrameGetLTM); }
|
|
|
|
static void* varRwMatrixRotate = AddressByVersion<void*>(0x7F1FD0, 0x7F28D0, 0x82BF90);
|
|
|
|
WRAPPER RwMatrix* RwMatrixRotate(RwMatrix* matrix, const RwV3d* axis, RwReal angle, RwOpCombineType combineOp) { WRAPARG(matrix); WRAPARG(axis); WRAPARG(angle); WRAPARG(combineOp); VARJMP(varRwMatrixRotate); }
|
|
|
|
static void* varRwD3D9SetRenderState = AddressByVersion<void*>(0x7FC2D0, 0x7FCBD0, 0x836290);
|
|
|
|
WRAPPER void RwD3D9SetRenderState(RwUInt32 state, RwUInt32 value) { WRAPARG(state); WRAPARG(value); VARJMP(varRwD3D9SetRenderState); }
|
2017-04-12 21:33:23 +02:00
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
RwCamera* RwCameraBeginUpdate(RwCamera* camera)
|
|
|
|
{
|
|
|
|
return camera->beginUpdate(camera);
|
|
|
|
}
|
|
|
|
|
|
|
|
RwCamera* RwCameraEndUpdate(RwCamera* camera)
|
|
|
|
{
|
|
|
|
return camera->endUpdate(camera);
|
|
|
|
}
|
|
|
|
|
|
|
|
RwCamera* RwCameraClear(RwCamera* camera, RwRGBA* colour, RwInt32 clearMode)
|
|
|
|
{
|
|
|
|
return RWSRCGLOBAL(stdFunc[rwSTANDARDCAMERACLEAR])(camera, colour, clearMode) != FALSE ? camera : NULL;
|
|
|
|
}
|
|
|
|
|
2017-03-29 01:14:38 +02:00
|
|
|
RwMatrix* RwMatrixTranslate(RwMatrix* matrix, const RwV3d* translation, RwOpCombineType combineOp)
|
|
|
|
{
|
|
|
|
if ( combineOp == rwCOMBINEREPLACE )
|
|
|
|
{
|
|
|
|
RwMatrixSetIdentity(matrix);
|
|
|
|
matrix->pos = *translation;
|
|
|
|
}
|
|
|
|
else if ( combineOp == rwCOMBINEPRECONCAT )
|
|
|
|
{
|
|
|
|
matrix->pos.x += matrix->at.x * translation->z + matrix->up.x * translation->y + matrix->right.x * translation->x;
|
|
|
|
matrix->pos.y += matrix->at.y * translation->z + matrix->up.y * translation->y + matrix->right.y * translation->x;
|
|
|
|
matrix->pos.z += matrix->at.z * translation->z + matrix->up.z * translation->y + matrix->right.z * translation->x;
|
|
|
|
}
|
|
|
|
else if ( combineOp == rwCOMBINEPOSTCONCAT )
|
|
|
|
{
|
|
|
|
matrix->pos.x += translation->x;
|
|
|
|
matrix->pos.y += translation->y;
|
|
|
|
matrix->pos.z += translation->z;
|
|
|
|
}
|
|
|
|
rwMatrixSetFlags(matrix, rwMatrixGetFlags(matrix) & ~(rwMATRIXINTERNALIDENTITY));
|
|
|
|
return matrix;
|
|
|
|
}
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
RwFrame* RwFrameForAllChildren(RwFrame* frame, RwFrameCallBack callBack, void* data)
|
|
|
|
{
|
2015-04-23 17:32:18 +02:00
|
|
|
for ( RwFrame* curFrame = frame->child; curFrame != nullptr; curFrame = curFrame->next )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2016-11-12 18:28:46 +01:00
|
|
|
if ( callBack(curFrame, data) == NULL )
|
2015-04-22 15:20:40 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
RwFrame* RwFrameForAllObjects(RwFrame* frame, RwObjectCallBack callBack, void* data)
|
|
|
|
{
|
|
|
|
for ( RwLLLink* link = rwLinkListGetFirstLLLink(&frame->objectList); link != rwLinkListGetTerminator(&frame->objectList); link = rwLLLinkGetNext(link) )
|
|
|
|
{
|
2016-11-12 18:28:46 +01:00
|
|
|
if ( callBack(&rwLLLinkGetData(link, RwObjectHasFrame, lFrame)->object, data) == NULL )
|
2015-04-22 15:20:40 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
RwFrame* RwFrameUpdateObjects(RwFrame* frame)
|
|
|
|
{
|
|
|
|
if ( !rwObjectTestPrivateFlags(&frame->root->object, rwFRAMEPRIVATEHIERARCHYSYNCLTM|rwFRAMEPRIVATEHIERARCHYSYNCOBJ) )
|
|
|
|
rwLinkListAddLLLink(&RWSRCGLOBAL(dirtyFrameList), &frame->root->inDirtyListLink);
|
|
|
|
|
|
|
|
rwObjectSetPrivateFlags(&frame->root->object, rwObjectGetPrivateFlags(&frame->root->object) | (rwFRAMEPRIVATEHIERARCHYSYNCLTM|rwFRAMEPRIVATEHIERARCHYSYNCOBJ));
|
|
|
|
rwObjectSetPrivateFlags(&frame->object, rwObjectGetPrivateFlags(&frame->object) | (rwFRAMEPRIVATESUBTREESYNCLTM|rwFRAMEPRIVATESUBTREESYNCOBJ));
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
RwMatrix* RwMatrixUpdate(RwMatrix* matrix)
|
|
|
|
{
|
|
|
|
matrix->flags &= ~(rwMATRIXTYPEMASK|rwMATRIXINTERNALIDENTITY);
|
|
|
|
return matrix;
|
|
|
|
}
|
|
|
|
|
|
|
|
RwRaster* RwRasterSetFromImage(RwRaster* raster, RwImage* image)
|
|
|
|
{
|
|
|
|
if ( RWSRCGLOBAL(stdFunc[rwSTANDARDRASTERSETIMAGE])(raster, image, 0) != FALSE )
|
|
|
|
{
|
|
|
|
if ( image->flags & rwIMAGEGAMMACORRECTED )
|
|
|
|
raster->privateFlags |= rwRASTERGAMMACORRECTED;
|
|
|
|
return raster;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
RwImage* RwImageFindRasterFormat(RwImage* ipImage, RwInt32 nRasterType, RwInt32* npWidth, RwInt32* npHeight, RwInt32* npDepth, RwInt32* npFormat)
|
|
|
|
{
|
|
|
|
RwRaster outRaster;
|
|
|
|
if ( RWSRCGLOBAL(stdFunc[rwSTANDARDIMAGEFINDRASTERFORMAT])(&outRaster, ipImage, nRasterType) != FALSE )
|
|
|
|
{
|
|
|
|
*npFormat = RwRasterGetFormat(&outRaster) | outRaster.cType;
|
|
|
|
*npWidth = RwRasterGetWidth(&outRaster);
|
|
|
|
*npHeight = RwRasterGetHeight(&outRaster);
|
|
|
|
*npDepth = RwRasterGetDepth(&outRaster);
|
|
|
|
return ipImage;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
RpClump* RpClumpForAllAtomics(RpClump* clump, RpAtomicCallBack callback, void* pData)
|
|
|
|
{
|
|
|
|
for ( RwLLLink* link = rwLinkListGetFirstLLLink(&clump->atomicList); link != rwLinkListGetTerminator(&clump->atomicList); link = rwLLLinkGetNext(link) )
|
|
|
|
{
|
2016-11-12 18:28:46 +01:00
|
|
|
if ( callback(rwLLLinkGetData(link, RpAtomic, inClumpLink), pData) == NULL )
|
2015-04-22 15:20:40 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return clump;
|
|
|
|
}
|
|
|
|
|
|
|
|
RpClump* RpClumpRender(RpClump* clump)
|
|
|
|
{
|
|
|
|
RpClump* retClump = clump;
|
|
|
|
|
|
|
|
for ( RwLLLink* link = rwLinkListGetFirstLLLink(&clump->atomicList); link != rwLinkListGetTerminator(&clump->atomicList); link = rwLLLinkGetNext(link) )
|
|
|
|
{
|
|
|
|
RpAtomic* curAtomic = rwLLLinkGetData(link, RpAtomic, inClumpLink);
|
|
|
|
if ( RpAtomicGetFlags(curAtomic) & rpATOMICRENDER )
|
|
|
|
{
|
|
|
|
// Not sure why they need this
|
|
|
|
RwFrameGetLTM(RpAtomicGetFrame(curAtomic));
|
2016-11-12 18:28:46 +01:00
|
|
|
if ( RpAtomicRender(curAtomic) == NULL )
|
2015-04-22 15:20:40 +02:00
|
|
|
retClump = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return retClump;
|
|
|
|
}
|
|
|
|
|
|
|
|
RpGeometry* RpGeometryForAllMaterials(RpGeometry* geometry, RpMaterialCallBack fpCallBack, void* pData)
|
|
|
|
{
|
|
|
|
for ( RwInt32 i = 0, j = geometry->matList.numMaterials; i < j; i++ )
|
|
|
|
{
|
2016-11-12 18:28:46 +01:00
|
|
|
if ( fpCallBack(geometry->matList.materials[i], pData) == NULL )
|
2015-04-22 15:20:40 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return geometry;
|
|
|
|
}
|
|
|
|
|
|
|
|
RwInt32 RpHAnimIDGetIndex(RpHAnimHierarchy* hierarchy, RwInt32 ID)
|
|
|
|
{
|
|
|
|
for ( RwInt32 i = 0, j = hierarchy->numNodes; i < j; i++ )
|
|
|
|
{
|
|
|
|
if ( ID == hierarchy->pNodeInfo[i].nodeID )
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
RwMatrix* RpHAnimHierarchyGetMatrixArray(RpHAnimHierarchy* hierarchy)
|
|
|
|
{
|
|
|
|
return hierarchy->pMatrixArray;
|
|
|
|
}
|
|
|
|
|
2017-04-02 19:00:49 +02:00
|
|
|
void RwD3D9DeleteVertexShader(void* shader)
|
|
|
|
{
|
|
|
|
static_cast<IUnknown*>(shader)->Release();
|
|
|
|
}
|
|
|
|
|
|
|
|
RwBool _rpD3D9VertexDeclarationInstColor(RwUInt8* mem, const RwRGBA* color, RwInt32 numVerts, RwUInt32 stride)
|
|
|
|
{
|
|
|
|
RwUInt8 alpha = 255;
|
|
|
|
for ( RwInt32 i = 0; i < numVerts; i++ )
|
|
|
|
{
|
|
|
|
*reinterpret_cast<RwUInt32*>(mem) = (color->alpha << 24) | (color->red << 16) | (color->green << 8) | color->blue;
|
|
|
|
alpha &= color->alpha;
|
|
|
|
color++;
|
|
|
|
mem += stride;
|
|
|
|
}
|
|
|
|
return alpha != 255;
|
|
|
|
}
|
|
|
|
|
2017-06-25 12:32:22 +02:00
|
|
|
// Unreachable stub
|
|
|
|
RwBool RwMatrixDestroy(RwMatrix* mpMat) { assert(!"Unreachable!"); return TRUE; }
|
|
|
|
|
2017-03-02 21:59:06 +01:00
|
|
|
struct AlphaObjectInfo
|
|
|
|
{
|
|
|
|
RpAtomic* pAtomic;
|
|
|
|
RpAtomic* (*callback)(RpAtomic*, float);
|
|
|
|
float fCompareValue;
|
|
|
|
|
|
|
|
friend bool operator < (const AlphaObjectInfo &a, const AlphaObjectInfo &b)
|
|
|
|
{ return a.fCompareValue < b.fCompareValue; }
|
|
|
|
};
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// Other wrappers
|
|
|
|
void (*GTAdelete)(void*) = AddressByVersion<void(*)(void*)>(0x82413F, 0x824EFF, 0x85E58C);
|
|
|
|
const char* (*GetFrameNodeName)(RwFrame*) = AddressByVersion<const char*(*)(RwFrame*)>(0x72FB30, 0x730360, 0x769C20);
|
2017-04-12 21:33:23 +02:00
|
|
|
RpHAnimHierarchy* (*GetAnimHierarchyFromSkinClump)(RpClump*) = AddressByVersion<RpHAnimHierarchy*(*)(RpClump*)>(0x734A40, 0x735270, 0x7671B0);
|
2015-04-22 15:20:40 +02:00
|
|
|
auto InitializeUtrax = AddressByVersion<void(__thiscall*)(void*)>(0x4F35B0, 0x4F3A10, 0x4FFA80);
|
|
|
|
|
2017-12-22 00:13:28 +01:00
|
|
|
auto RenderOneXLUSprite = AddressByVersion<void(*)(float, float, float, float, float, uint8_t, uint8_t, uint8_t, int16_t, float, uint8_t, uint8_t, uint8_t)>(0x70D000, 0x70D830, 0x7592C0);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-04-12 21:33:23 +02:00
|
|
|
static void (__thiscall* SetVolume)(void*,float);
|
2015-04-22 15:20:40 +02:00
|
|
|
static BOOL (*IsAlreadyRunning)();
|
|
|
|
static void (*TheScriptsLoad)();
|
|
|
|
static void (*WipeLocalVariableMemoryForMissionScript)();
|
|
|
|
static void (*DoSunAndMoon)();
|
|
|
|
|
2016-05-29 14:33:07 +02:00
|
|
|
auto WorldRemove = AddressByVersion<void(*)(CEntity*)>(0x563280, 0, 0x57D370, 0x57C480, 0x57C3B0);
|
2016-04-24 20:37:14 +02:00
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// SA variables
|
2016-03-31 20:45:49 +02:00
|
|
|
void** rwengine = *AddressByVersion<void***>(0x58FFC0, 0x53F032, 0x48C194, 0x48B167, 0x48B167);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
unsigned char& nGameClockDays = **AddressByVersion<unsigned char**>(0x4E841D, 0x4E886D, 0x4F3871);
|
|
|
|
unsigned char& nGameClockMonths = **AddressByVersion<unsigned char**>(0x4E842D, 0x4E887D, 0x4F3861);
|
|
|
|
void*& pUserTracksStuff = **AddressByVersion<void***>(0x4D9B7B, 0x4DA06C, 0x4E4A43);
|
|
|
|
|
|
|
|
float& fFarClipZ = **AddressByVersion<float**>(0x70D21F, 0x70DA4F, 0x421AB2);
|
|
|
|
RwTexture** const gpCoronaTexture = *AddressByVersion<RwTexture***>(0x6FAA8C, 0x6FB2BC, 0x5480BF);
|
|
|
|
int& MoonSize = **AddressByVersion<int**>(0x713B0C, 0x71433C, 0x72F0AB);
|
|
|
|
|
|
|
|
CZoneInfo*& pCurrZoneInfo = **AddressByVersion<CZoneInfo***>(0x58ADB1, 0x58B581, 0x407F93);
|
|
|
|
CRGBA* HudColour = *AddressByVersion<CRGBA**>(0x58ADF6, 0x58B5C6, 0x440648);
|
|
|
|
|
|
|
|
CLinkListSA<CPed*>& ms_weaponPedsForPC = **AddressByVersion<CLinkListSA<CPed*>**>(0x53EACA, 0x53EF6A, 0x551101);
|
|
|
|
CLinkListSA<AlphaObjectInfo>& m_alphaList = **AddressByVersion<CLinkListSA<AlphaObjectInfo>**>(0x733A4D, 0x73427D, 0x76DCA3);
|
|
|
|
|
2017-09-19 21:40:48 +02:00
|
|
|
DebugMenuAPI gDebugMenuAPI;
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Custom variables
|
|
|
|
static float fSunFarClip;
|
|
|
|
static HMODULE hDLLModule;
|
|
|
|
static struct
|
|
|
|
{
|
|
|
|
char Extension[8];
|
|
|
|
unsigned int Codec;
|
|
|
|
} UserTrackExtensions[] = { { ".ogg", DECODER_VORBIS }, { ".mp3", DECODER_QUICKTIME },
|
|
|
|
{ ".wav", DECODER_WAVE }, { ".wma", DECODER_WINDOWSMEDIA },
|
|
|
|
{ ".wmv", DECODER_WINDOWSMEDIA }, { ".aac", DECODER_QUICKTIME },
|
|
|
|
{ ".m4a", DECODER_QUICKTIME }, { ".mov", DECODER_QUICKTIME },
|
|
|
|
{ ".fla", DECODER_FLAC }, { ".flac", DECODER_FLAC } };
|
|
|
|
|
|
|
|
|
|
|
|
// Regular functions
|
|
|
|
static RpAtomic* RenderAtomic(RpAtomic* pAtomic, float fComp)
|
|
|
|
{
|
|
|
|
UNREFERENCED_PARAMETER(fComp);
|
|
|
|
return AtomicDefaultRenderCallBack(pAtomic);
|
|
|
|
}
|
|
|
|
|
2017-09-28 21:43:16 +02:00
|
|
|
static RpAtomic* StaticPropellerRender(RpAtomic* pAtomic)
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2017-09-28 21:43:16 +02:00
|
|
|
int nPushedAlpha;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
RwRenderStateGet(rwRENDERSTATEALPHATESTFUNCTIONREF, &nPushedAlpha);
|
2017-04-12 21:33:23 +02:00
|
|
|
|
2017-09-28 21:43:16 +02:00
|
|
|
RwRenderStateSet(rwRENDERSTATEALPHATESTFUNCTIONREF, 0);
|
|
|
|
pAtomic = AtomicDefaultRenderCallBack(pAtomic);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
RwRenderStateSet(rwRENDERSTATEALPHATESTFUNCTIONREF, reinterpret_cast<void*>(nPushedAlpha));
|
2017-09-28 21:43:16 +02:00
|
|
|
return pAtomic;
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
2017-09-28 21:43:16 +02:00
|
|
|
static RpAtomic* MovingPropellerRender(RpAtomic* pAtomic)
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2017-09-28 21:43:16 +02:00
|
|
|
int nPushedAlpha, nAlphaBlending;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
RwRenderStateGet(rwRENDERSTATEALPHATESTFUNCTIONREF, &nPushedAlpha);
|
|
|
|
RwRenderStateGet(rwRENDERSTATEVERTEXALPHAENABLE, &nAlphaBlending);
|
|
|
|
|
|
|
|
RwRenderStateSet(rwRENDERSTATEALPHATESTFUNCTIONREF, 0);
|
2017-09-28 21:43:16 +02:00
|
|
|
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, reinterpret_cast<void*>(TRUE));
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
pAtomic = AtomicDefaultRenderCallBack(pAtomic);
|
|
|
|
|
|
|
|
RwRenderStateSet(rwRENDERSTATEALPHATESTFUNCTIONREF, reinterpret_cast<void*>(nPushedAlpha));
|
2017-09-28 21:43:16 +02:00
|
|
|
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, reinterpret_cast<void*>(nAlphaBlending));
|
2015-04-22 15:20:40 +02:00
|
|
|
return pAtomic;
|
|
|
|
}
|
|
|
|
|
2017-09-28 21:43:16 +02:00
|
|
|
RpAtomic* RenderBigVehicleActomic(RpAtomic* pAtomic, float)
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
const char* pNodeName = GetFrameNodeName(RpAtomicGetFrame(pAtomic));
|
|
|
|
|
2018-04-12 23:56:25 +02:00
|
|
|
if ( _stricmp(pNodeName, "moving_prop") == 0 )
|
2017-09-28 21:43:16 +02:00
|
|
|
return MovingPropellerRender(pAtomic);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2018-04-12 23:56:25 +02:00
|
|
|
if ( _stricmp(pNodeName, "static_prop") == 0 )
|
2015-04-22 15:20:40 +02:00
|
|
|
return StaticPropellerRender(pAtomic);
|
|
|
|
|
|
|
|
return AtomicDefaultRenderCallBack(pAtomic);
|
|
|
|
}
|
|
|
|
|
|
|
|
void RenderVehicleHiDetailAlphaCB_HunterDoor(RpAtomic* pAtomic)
|
|
|
|
{
|
|
|
|
AlphaObjectInfo NewObject;
|
|
|
|
|
|
|
|
NewObject.callback = RenderAtomic;
|
|
|
|
NewObject.fCompareValue = -std::numeric_limits<float>::infinity();
|
|
|
|
NewObject.pAtomic = pAtomic;
|
|
|
|
|
2016-11-20 15:58:39 +01:00
|
|
|
m_alphaList.InsertFront(NewObject);
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void RenderWeapon(CPed* pPed)
|
|
|
|
{
|
|
|
|
pPed->RenderWeapon(false, false);
|
|
|
|
ms_weaponPedsForPC.Insert(pPed);
|
|
|
|
}
|
|
|
|
|
|
|
|
void RenderWeaponPedsForPC()
|
|
|
|
{
|
|
|
|
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, reinterpret_cast<void*>(TRUE));
|
|
|
|
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, FALSE);
|
|
|
|
|
2016-11-20 15:58:39 +01:00
|
|
|
for ( auto it = ms_weaponPedsForPC.Next( nullptr ); it != nullptr; it = ms_weaponPedsForPC.Next( it ) )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2017-03-02 21:47:09 +01:00
|
|
|
CPed* ped = **it;
|
|
|
|
ped->SetupLighting();
|
|
|
|
ped->RenderWeapon(true, false);
|
|
|
|
ped->RemoveLighting();
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*void RenderWeaponsList()
|
|
|
|
{
|
|
|
|
int nPushedAlpha, nAlphaFunction;
|
|
|
|
int nZWrite;
|
|
|
|
int nAlphaBlending;
|
|
|
|
|
|
|
|
RwRenderStateGet(rwRENDERSTATEALPHATESTFUNCTIONREF, &nPushedAlpha);
|
|
|
|
RwRenderStateGet(rwRENDERSTATEZWRITEENABLE, &nZWrite);
|
|
|
|
RwRenderStateGet(rwRENDERSTATEVERTEXALPHAENABLE, &nAlphaBlending);
|
|
|
|
RwRenderStateGet(rwRENDERSTATEALPHATESTFUNCTION, &nAlphaFunction);
|
|
|
|
|
|
|
|
RwRenderStateSet(rwRENDERSTATEALPHATESTFUNCTIONREF, reinterpret_cast<void*>(255));
|
|
|
|
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, reinterpret_cast<void*>(TRUE));
|
|
|
|
RwRenderStateSet(rwRENDERSTATEALPHATESTFUNCTION, reinterpret_cast<void*>(rwALPHATESTFUNCTIONLESS));
|
|
|
|
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, FALSE);
|
|
|
|
|
|
|
|
for ( auto i = ms_weaponPedsForPC.m_lnListHead.m_pNext; i != &ms_weaponPedsForPC.m_lnListTail; i = i->m_pNext )
|
|
|
|
{
|
|
|
|
i->V()->SetupLighting();
|
|
|
|
RenderWeaponHooked(i->V());
|
|
|
|
i->V()->RemoveLighting();
|
|
|
|
}
|
|
|
|
|
|
|
|
RwRenderStateSet(rwRENDERSTATEALPHATESTFUNCTIONREF, reinterpret_cast<void*>(nPushedAlpha));
|
|
|
|
RwRenderStateSet(rwRENDERSTATEALPHATESTFUNCTION, reinterpret_cast<void*>(nAlphaFunction));
|
|
|
|
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, reinterpret_cast<void*>(nZWrite));
|
|
|
|
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, reinterpret_cast<void*>(nAlphaBlending));
|
|
|
|
}*/
|
|
|
|
|
|
|
|
static CAEFLACDecoder* __stdcall DecoderCtor(CAEDataStream* pData)
|
|
|
|
{
|
|
|
|
return new CAEFLACDecoder(pData);
|
|
|
|
}
|
|
|
|
|
|
|
|
static CAEWaveDecoder* __stdcall CAEWaveDecoderInit(CAEDataStream* pStream)
|
|
|
|
{
|
|
|
|
return new CAEWaveDecoder(pStream);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void BasketballFix(unsigned char* pBuf, int nSize)
|
|
|
|
{
|
|
|
|
for ( int i = 0, hits = 0; i < nSize && hits < 7; i++, pBuf++ )
|
|
|
|
{
|
|
|
|
// Pattern check for save pickup XYZ
|
|
|
|
if ( *(unsigned int*)pBuf == 0x449DE19A ) // Save pickup X
|
|
|
|
{
|
|
|
|
hits++;
|
|
|
|
*(float*)pBuf = 1291.8f;
|
|
|
|
}
|
|
|
|
else if ( *(unsigned int*)pBuf == 0xC4416AE1 ) // Save pickup Y
|
|
|
|
{
|
|
|
|
hits++;
|
|
|
|
*(float*)pBuf = -797.8284f;
|
|
|
|
}
|
|
|
|
else if ( *(unsigned int*)pBuf == 0x44886C7B ) // Save pickup Z
|
|
|
|
{
|
|
|
|
hits++;
|
|
|
|
*(float*)pBuf = 1089.5f;
|
|
|
|
}
|
|
|
|
else if ( *(unsigned int*)pBuf == 0x449DF852 ) // Save point X
|
|
|
|
{
|
|
|
|
hits++;
|
|
|
|
*(float*)pBuf = 1286.8f;
|
|
|
|
}
|
|
|
|
else if ( *(unsigned int*)pBuf == 0xC44225C3 ) // Save point Y
|
|
|
|
{
|
|
|
|
hits++;
|
|
|
|
*(float*)pBuf = -797.69f;
|
|
|
|
}
|
|
|
|
else if ( *(unsigned int*)pBuf == 0x44885C7B ) // Save point Z
|
|
|
|
{
|
|
|
|
hits++;
|
|
|
|
*(float*)pBuf = 1089.1f;
|
|
|
|
}
|
|
|
|
else if ( *(unsigned int*)pBuf == 0x43373AE1 ) // Save point A
|
|
|
|
{
|
|
|
|
hits++;
|
|
|
|
*(float*)pBuf = 90.0f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-23 19:12:04 +02:00
|
|
|
static unsigned char* ScriptSpace;
|
|
|
|
static int* ScriptParams;
|
|
|
|
static size_t ScriptFileSize, ScriptMissionSize;
|
|
|
|
|
|
|
|
static void InitializeScriptGlobals()
|
|
|
|
{
|
2017-05-14 00:23:06 +02:00
|
|
|
static bool bInitScriptStuff = [] () {;
|
2016-10-23 19:12:04 +02:00
|
|
|
ScriptSpace = *AddressByVersion<unsigned char**>(0x5D5380, 0x5D5B60, 0x450E34);
|
|
|
|
ScriptParams = *AddressByVersion<int**>(0x48995B, 0x46410A, 0x46979A);
|
2017-03-20 22:57:28 +01:00
|
|
|
ScriptFileSize = *AddressByVersion<size_t*>( 0x468E74+1, 0, 0x46E572+1);
|
|
|
|
ScriptMissionSize = *AddressByVersion<size_t*>( 0x489A5A+1, 0, 0x490798+1);
|
2016-10-23 19:12:04 +02:00
|
|
|
|
2017-05-14 00:23:06 +02:00
|
|
|
return true;
|
|
|
|
} ();
|
2016-10-23 19:12:04 +02:00
|
|
|
}
|
|
|
|
|
2016-10-23 20:05:44 +02:00
|
|
|
static void SweetsGirlFix()
|
|
|
|
{
|
|
|
|
// Changes @ == int to @ >= int in two places
|
|
|
|
if ( *(uint16_t*)(ScriptSpace+ScriptFileSize+2510) == 0x0039 )
|
|
|
|
*(uint16_t*)(ScriptSpace+ScriptFileSize+2510) = 0x0029;
|
|
|
|
|
|
|
|
if ( *(uint16_t*)(ScriptSpace+ScriptFileSize+2680) == 0x0039 )
|
|
|
|
*(uint16_t*)(ScriptSpace+ScriptFileSize+2680) = 0x0029;
|
|
|
|
}
|
|
|
|
|
2016-03-13 13:33:52 +01:00
|
|
|
static void MountainCloudBoysFix()
|
|
|
|
{
|
2017-12-25 01:57:44 +01:00
|
|
|
auto pattern = hook::make_range_pattern( uintptr_t(ScriptSpace+ScriptFileSize), uintptr_t(ScriptSpace+ScriptFileSize+ScriptMissionSize),
|
2017-04-27 02:19:27 +02:00
|
|
|
"D6 00 04 00 39 00 03 EF 00 04 02 4D 00 01 90 F2 FF FF D6 00 04 01" ).count_hint(1);
|
|
|
|
if ( pattern.size() == 1 ) // Faulty code lies under offset 3367 - replace it if it matches
|
2016-03-13 13:33:52 +01:00
|
|
|
{
|
2017-03-17 01:24:33 +01:00
|
|
|
const uint8_t bNewCode[22] = {
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0xD6, 0x00, 0x04, 0x03, 0x39, 0x00, 0x03, 0x2B,
|
|
|
|
0x00, 0x04, 0x0B, 0x39, 0x00, 0x03, 0xEF, 0x00, 0x04, 0x02
|
|
|
|
};
|
2017-04-27 02:19:27 +02:00
|
|
|
memcpy( pattern.get(0).get<void>(), bNewCode, sizeof(bNewCode) );
|
2016-03-13 13:33:52 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-01-14 02:04:38 +01:00
|
|
|
static void SupplyLinesFix( bool isBeefyBaron )
|
|
|
|
{
|
|
|
|
auto pattern = hook::make_range_pattern( uintptr_t(ScriptSpace+ScriptFileSize), uintptr_t(ScriptSpace+ScriptFileSize+ScriptMissionSize),
|
|
|
|
isBeefyBaron ? "B8 9E 3A 44" : "B8 1E 2F 44" ).count_hint(1);
|
|
|
|
if ( pattern.size() == 1 ) // 700.48 -> 10.0 (teleports car with CJ under the building instead)
|
|
|
|
{
|
|
|
|
*pattern.get(0).get<float>() = 10.0f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-17 10:07:25 +01:00
|
|
|
static void QuadrupleStuntBonus()
|
2017-03-17 01:24:33 +01:00
|
|
|
{
|
|
|
|
// IF HEIGHT_FLOAT_HJ > 4.0 -> IF HEIGHT_INT_HJ > 4
|
2017-12-25 01:57:44 +01:00
|
|
|
auto pattern = hook::make_range_pattern( uintptr_t(ScriptSpace), uintptr_t(ScriptSpace+ScriptFileSize), "20 00 02 60 14 06 00 00 80 40" ).count_hint(1);
|
2017-03-17 01:24:33 +01:00
|
|
|
if ( pattern.size() == 1 )
|
|
|
|
{
|
|
|
|
const uint8_t newCode[10] = {
|
|
|
|
0x18, 0x00, 0x02, 0x30, 0x14, 0x01, 0x04, 0x00, 0x00, 0x00
|
|
|
|
};
|
|
|
|
memcpy( pattern.get(0).get<void>(), newCode, sizeof(newCode) );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
void TheScriptsLoad_BasketballFix()
|
|
|
|
{
|
|
|
|
TheScriptsLoad();
|
2016-10-23 19:12:04 +02:00
|
|
|
InitializeScriptGlobals();
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
BasketballFix(ScriptSpace+8, *(int*)(ScriptSpace+3));
|
2017-03-17 10:07:25 +01:00
|
|
|
QuadrupleStuntBonus();
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
2016-03-13 13:33:52 +01:00
|
|
|
void StartNewMission_SCMFixes()
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
WipeLocalVariableMemoryForMissionScript();
|
2016-10-23 19:12:04 +02:00
|
|
|
InitializeScriptGlobals();
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2018-01-14 02:04:38 +01:00
|
|
|
const int missionID = ScriptParams[0];
|
|
|
|
|
2017-03-17 01:24:33 +01:00
|
|
|
// INITIAL - Basketball fix, Quadruple Stunt Bonus
|
2018-01-14 02:04:38 +01:00
|
|
|
if ( missionID == 0 )
|
2017-03-17 01:24:33 +01:00
|
|
|
{
|
2016-10-23 19:12:04 +02:00
|
|
|
BasketballFix(ScriptSpace+ScriptFileSize, ScriptMissionSize);
|
2017-03-17 10:07:25 +01:00
|
|
|
QuadrupleStuntBonus();
|
2017-03-17 01:24:33 +01:00
|
|
|
}
|
2016-10-23 20:05:44 +02:00
|
|
|
// HOODS5 - Sweet's Girl fix
|
2018-01-14 02:04:38 +01:00
|
|
|
else if ( missionID == 18 )
|
2016-10-23 20:05:44 +02:00
|
|
|
SweetsGirlFix();
|
2016-03-13 13:33:52 +01:00
|
|
|
// WUZI1 - Mountain Cloud Boys fix
|
2018-01-14 02:04:38 +01:00
|
|
|
else if ( missionID == 53 )
|
2016-03-13 13:33:52 +01:00
|
|
|
MountainCloudBoysFix();
|
2018-01-14 02:04:38 +01:00
|
|
|
// ZERO2 - Supply Lines fix
|
|
|
|
else if ( missionID == 73 )
|
|
|
|
SupplyLinesFix( false );
|
|
|
|
// ZERO5 - Beefy Baron fix
|
|
|
|
else if ( missionID == 10 )
|
|
|
|
SupplyLinesFix( true );
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// 1.01 kinda fixed it
|
|
|
|
bool GetCurrentZoneLockedOrUnlocked(float fPosX, float fPosY)
|
|
|
|
{
|
2016-10-23 18:56:34 +02:00
|
|
|
// Exploit RAII really bad
|
2017-03-11 15:43:55 +01:00
|
|
|
static const float GridXOffset = **(float**)(0x572135+2), GridYOffset = **(float**)(0x57214A+2);
|
|
|
|
static const float GridXSize = **(float**)(0x57213B+2), GridYSize = **(float**)(0x572153+2);
|
2017-04-02 19:41:50 +02:00
|
|
|
static const int GridXNum = static_cast<int>((2.0f*GridXOffset) * GridXSize), GridYNum = static_cast<int>((2.0f*GridYOffset) * GridYSize);
|
2016-10-23 18:56:34 +02:00
|
|
|
|
2017-03-11 15:43:55 +01:00
|
|
|
static unsigned char* const ZonesVisited = *(unsigned char**)(0x57216A) - (GridYNum-1); // 1.01 fixed it!
|
2016-10-23 18:56:34 +02:00
|
|
|
|
2017-04-02 19:41:50 +02:00
|
|
|
int Xindex = static_cast<int>((fPosX+GridXOffset) * GridXSize);
|
|
|
|
int Yindex = static_cast<int>((fPosY+GridYOffset) * GridYSize);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// "Territories fix"
|
2016-10-23 18:56:34 +02:00
|
|
|
if ( (Xindex >= 0 && Xindex < GridXNum) && (Yindex >= 0 && Yindex < GridYNum) )
|
|
|
|
return ZonesVisited[GridXNum*Xindex - Yindex + (GridYNum-1)] != 0;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Outside of map bounds
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-03-11 15:43:55 +01:00
|
|
|
bool GetCurrentZoneLockedOrUnlocked_Steam(float fPosX, float fPosY)
|
|
|
|
{
|
|
|
|
static unsigned char* const ZonesVisited = *(unsigned char**)(0x5870E8) - 9;
|
|
|
|
|
2017-04-02 19:41:50 +02:00
|
|
|
int Xindex = static_cast<int>((fPosX+3000.0f) / 600.0f);
|
|
|
|
int Yindex = static_cast<int>((fPosY+3000.0f) / 600.0f);
|
2017-03-11 15:43:55 +01:00
|
|
|
|
|
|
|
// "Territories fix"
|
|
|
|
if ( (Xindex >= 0 && Xindex < 10) && (Yindex >= 0 && Yindex < 10) )
|
|
|
|
return ZonesVisited[10*Xindex - Yindex + 9] != 0;
|
|
|
|
|
|
|
|
// Outside of map bounds
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// By NTAuthority
|
2017-12-22 00:13:28 +01:00
|
|
|
void DrawMoonWithPhases(uint8_t moonColor, float* screenPos, float sizeX, float sizeY)
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2017-05-14 00:23:06 +02:00
|
|
|
static RwTexture* gpMoonMask = [] () {
|
2017-04-09 18:21:07 +02:00
|
|
|
if ( GetFileAttributesW(L"lunar.png") != INVALID_FILE_ATTRIBUTES )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
// load from file
|
2017-05-14 00:23:06 +02:00
|
|
|
return CPNGFile::ReadFromFile("lunar.png");
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
2017-05-14 00:23:06 +02:00
|
|
|
// Load from memory
|
2017-12-30 12:37:30 +01:00
|
|
|
HRSRC resource = FindResource(hDLLModule, MAKEINTRESOURCE(IDB_LUNAR64), RT_RCDATA);
|
2018-01-15 01:51:36 +01:00
|
|
|
assert( resource != nullptr );
|
2017-05-14 00:23:06 +02:00
|
|
|
void* pMoonMask = LockResource( LoadResource(hDLLModule, resource) );
|
|
|
|
|
|
|
|
return CPNGFile::ReadFromMemory(pMoonMask, SizeofResource(hDLLModule, resource));
|
|
|
|
} ();
|
2015-04-22 15:20:40 +02:00
|
|
|
//D3DPERF_BeginEvent(D3DCOLOR_ARGB(0,0,0,0), L"render moon");
|
|
|
|
|
|
|
|
float currentDayFraction = nGameClockDays / 31.0f;
|
|
|
|
|
|
|
|
RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nullptr);
|
|
|
|
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
|
|
|
|
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
|
|
|
|
|
|
|
|
float a10 = 1.0f / fFarClipZ;
|
|
|
|
float size = (MoonSize * 2) + 4.0f;
|
|
|
|
|
|
|
|
RwD3D9SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA);
|
|
|
|
|
2017-12-22 00:13:28 +01:00
|
|
|
RenderOneXLUSprite(screenPos[0], screenPos[1], fFarClipZ, sizeX * size, sizeY * size, 0, 0, 0, 0, a10, 255, 0, 0);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-05-14 00:23:06 +02:00
|
|
|
RwRenderStateSet(rwRENDERSTATETEXTURERASTER, gpMoonMask != nullptr ? RwTextureGetRaster(gpMoonMask) : nullptr );
|
2015-04-22 15:20:40 +02:00
|
|
|
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDINVSRCCOLOR);
|
|
|
|
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCCOLOR);
|
|
|
|
|
|
|
|
float maskX = (sizeX * size) * 5.4f * (currentDayFraction - 0.5f) + screenPos[0];
|
|
|
|
float maskY = screenPos[1] + ((sizeY * size) * 0.7f);
|
|
|
|
|
2017-12-22 00:13:28 +01:00
|
|
|
RenderOneXLUSprite(maskX, maskY, fFarClipZ, sizeX * size * 1.7f, sizeY * size * 1.7f, 0, 0, 0, 255, a10, 255, 0, 0);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
RwD3D9SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_BLUE | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_RED);
|
|
|
|
|
|
|
|
RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpCoronaTexture[2]));
|
|
|
|
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDDESTALPHA);
|
|
|
|
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
|
|
|
|
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, 0);
|
|
|
|
|
2017-12-22 00:13:28 +01:00
|
|
|
RenderOneXLUSprite(screenPos[0], screenPos[1], fFarClipZ, sizeX * size, sizeY * size, moonColor, moonColor, static_cast<uint8_t>(moonColor * 0.85f), 255, a10, 255, 0, 0);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDONE);
|
|
|
|
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
|
|
|
|
|
|
|
|
//D3DPERF_EndEvent();
|
|
|
|
}
|
|
|
|
|
2017-12-30 12:45:12 +01:00
|
|
|
CRGBA* CRGBA::BlendGangColour(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
|
|
|
|
{
|
|
|
|
const double colourIntensity = std::min( static_cast<double>(pCurrZoneInfo->ZoneColour.a) / 120.0, 1.0 );
|
|
|
|
*this = CRGBA(BlendSqr( HudColour[3], CRGBA(r, g, b), colourIntensity ), a);
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
2017-11-15 00:20:17 +01:00
|
|
|
static bool bColouredZoneNames;
|
|
|
|
CRGBA* CRGBA::BlendGangColour_Dynamic(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
|
|
|
|
{
|
|
|
|
if ( bColouredZoneNames )
|
|
|
|
{
|
2017-12-30 12:45:12 +01:00
|
|
|
return BlendGangColour(r, g, b, a);
|
2017-11-15 00:20:17 +01:00
|
|
|
}
|
2017-12-30 12:45:12 +01:00
|
|
|
*this = HudColour[3];
|
2015-04-22 15:20:40 +02:00
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SunAndMoonFarClip()
|
|
|
|
{
|
2016-11-12 18:28:46 +01:00
|
|
|
fSunFarClip = std::min(1500.0f, fFarClipZ);
|
2015-04-22 15:20:40 +02:00
|
|
|
DoSunAndMoon();
|
|
|
|
}
|
|
|
|
|
|
|
|
// STEAM ONLY
|
|
|
|
template<bool bX1, bool bY1, bool bX2, bool bY2>
|
|
|
|
void DrawRect_HalfPixel_Steam(CRect& rect, const CRGBA& rgba)
|
|
|
|
{
|
2017-09-12 16:08:22 +02:00
|
|
|
if constexpr ( bX1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
rect.x1 -= 0.5f;
|
|
|
|
|
2017-09-12 16:08:22 +02:00
|
|
|
if constexpr ( bY1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
rect.y1 -= 0.5f;
|
|
|
|
|
2017-09-12 16:08:22 +02:00
|
|
|
if constexpr ( bX2 )
|
2015-04-22 15:20:40 +02:00
|
|
|
rect.x2 -= 0.5f;
|
|
|
|
|
2017-09-12 16:08:22 +02:00
|
|
|
if constexpr ( bY2 )
|
2015-04-22 15:20:40 +02:00
|
|
|
rect.y2 -= 0.5f;
|
|
|
|
|
|
|
|
// Steam CSprite2d::DrawRect
|
|
|
|
((void(*)(const CRect&, const CRGBA&))0x75CDA0)(rect, rgba);
|
|
|
|
}
|
|
|
|
|
2017-09-18 22:13:02 +02:00
|
|
|
char* GetMyDocumentsPathSA()
|
2015-04-23 17:32:18 +02:00
|
|
|
{
|
2018-01-06 16:11:15 +01:00
|
|
|
static char* const pDocumentsPath = [&] () -> char* {
|
|
|
|
static char cUserFilesPath[MAX_PATH];
|
|
|
|
char* const ppTempBufPtr = Memory::GetVersion().version == 0 ? *AddressByRegion_10<char**>(0x744FE5) : cUserFilesPath;
|
2015-05-05 23:32:50 +02:00
|
|
|
|
2018-01-06 16:04:11 +01:00
|
|
|
if ( SHGetFolderPathA(nullptr, CSIDL_MYDOCUMENTS, nullptr, SHGFP_TYPE_CURRENT, ppTempBufPtr) == S_OK )
|
|
|
|
{
|
2018-01-06 16:11:15 +01:00
|
|
|
char** const ppUserFilesDir = AddressByVersion<char**>(0x74503F, 0x74586F, 0x77EE50, 0x77902B, 0x778F1B);
|
|
|
|
|
2018-01-06 16:04:11 +01:00
|
|
|
PathAppendA(ppTempBufPtr, *ppUserFilesDir);
|
|
|
|
CreateDirectoryA(ppTempBufPtr, nullptr);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
strcpy_s(ppTempBufPtr, MAX_PATH, "data");
|
|
|
|
}
|
2015-04-23 17:32:18 +02:00
|
|
|
|
2018-01-06 16:04:11 +01:00
|
|
|
char cTmpPath[MAX_PATH];
|
2015-04-23 17:32:18 +02:00
|
|
|
|
2017-04-09 18:21:07 +02:00
|
|
|
strcpy_s(cTmpPath, ppTempBufPtr);
|
|
|
|
PathAppendA(cTmpPath, "Gallery");
|
|
|
|
CreateDirectoryA(cTmpPath, nullptr);
|
2015-04-23 17:32:18 +02:00
|
|
|
|
2017-04-09 18:21:07 +02:00
|
|
|
strcpy_s(cTmpPath, ppTempBufPtr);
|
|
|
|
PathAppendA(cTmpPath, "User Tracks");
|
|
|
|
CreateDirectoryA(cTmpPath, nullptr);
|
2017-05-14 00:23:06 +02:00
|
|
|
|
2018-01-06 16:11:15 +01:00
|
|
|
return ppTempBufPtr;
|
2017-05-14 00:23:06 +02:00
|
|
|
} ();
|
2018-01-06 16:11:15 +01:00
|
|
|
return pDocumentsPath;
|
2015-04-23 17:32:18 +02:00
|
|
|
}
|
|
|
|
|
2015-06-28 22:17:29 +02:00
|
|
|
static LARGE_INTEGER FrameTime;
|
2017-03-06 22:35:08 +01:00
|
|
|
int32_t GetTimeSinceLastFrame()
|
2015-06-28 22:17:29 +02:00
|
|
|
{
|
|
|
|
LARGE_INTEGER curTime;
|
|
|
|
QueryPerformanceCounter(&curTime);
|
2017-03-06 22:35:08 +01:00
|
|
|
return int32_t(curTime.QuadPart - FrameTime.QuadPart);
|
2015-06-28 22:17:29 +02:00
|
|
|
}
|
|
|
|
|
2017-03-06 22:35:08 +01:00
|
|
|
static int (*RsEventHandler)(int, void*);
|
|
|
|
int NewFrameRender(int nEvent, void* pParam)
|
2015-06-28 22:17:29 +02:00
|
|
|
{
|
|
|
|
QueryPerformanceCounter(&FrameTime);
|
2017-03-06 22:35:08 +01:00
|
|
|
return RsEventHandler(nEvent, pParam);
|
2015-06-28 22:17:29 +02:00
|
|
|
}
|
|
|
|
|
2015-09-14 01:00:39 +02:00
|
|
|
#include <ctime>
|
|
|
|
#include <random>
|
|
|
|
|
2017-03-09 00:53:03 +01:00
|
|
|
static std::ranlux48 generator (time(nullptr));
|
|
|
|
int32_t Int32Rand()
|
2015-09-14 01:00:39 +02:00
|
|
|
{
|
2017-03-09 00:53:03 +01:00
|
|
|
return generator() & INT32_MAX;
|
2015-09-14 01:00:39 +02:00
|
|
|
}
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
void (*FlushSpriteBuffer)() = AddressByVersion<void(*)()>(0x70CF20, 0x70D750, 0x7591E0, 0x753AE0, 0x753A00);
|
2016-01-11 23:55:25 +01:00
|
|
|
void FlushLensSwitchZ( RwRenderState rwa, void* rwb )
|
|
|
|
{
|
|
|
|
FlushSpriteBuffer();
|
|
|
|
RwRenderStateSet( rwa, rwb );
|
|
|
|
}
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
void (*InitSpriteBuffer2D)() = AddressByVersion<void(*)()>(0x70CFD0, 0x70D800, 0x759290, 0x753B90, 0x753AB0);
|
2016-01-11 23:55:25 +01:00
|
|
|
void InitBufferSwitchZ( RwRenderState rwa, void* rwb )
|
|
|
|
{
|
|
|
|
RwRenderStateSet( rwa, rwb );
|
|
|
|
InitSpriteBuffer2D();
|
|
|
|
}
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
static void* const g_fx = *AddressByVersion<void**>(0x4A9649, 0x4AA4EF, 0x4B2BB9, 0x4B0BE4, 0x4B0BC4);
|
2017-12-26 01:59:22 +01:00
|
|
|
static int32_t GetFxQuality()
|
|
|
|
{
|
|
|
|
return *(int32_t*)( (uint8_t*)g_fx + 0x54 );
|
|
|
|
}
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
|
|
|
|
DWORD* msaaValues = *AddressByVersion<DWORD**>(0x4CCBC5, 0x4CCDB5, 0x4D7462, 0x4D6CE5, 0x4D6CB5);
|
|
|
|
RwRaster*& pMirrorBuffer = **AddressByVersion<RwRaster***>(0x723001, 0x723831, 0x754971, 0x74F3E1, 0x74F311);
|
|
|
|
RwRaster*& pMirrorZBuffer = **AddressByVersion<RwRaster***>(0x72301C, 0x72384C, 0x75498C, 0x74F3FC, 0x74F32C);
|
|
|
|
void CreateMirrorBuffers()
|
|
|
|
{
|
|
|
|
if ( pMirrorBuffer == nullptr )
|
|
|
|
{
|
|
|
|
DWORD oldMsaa[2] = { msaaValues[0], msaaValues[1] };
|
|
|
|
msaaValues[0] = msaaValues[1] = 0;
|
|
|
|
|
2017-12-26 01:59:22 +01:00
|
|
|
int32_t quality = GetFxQuality();
|
2017-03-09 00:58:51 +01:00
|
|
|
RwInt32 width, height;
|
2016-03-31 20:45:49 +02:00
|
|
|
|
|
|
|
if ( quality >= 3 ) // Very High
|
|
|
|
{
|
2017-03-09 00:58:51 +01:00
|
|
|
width = 2048;
|
|
|
|
height = 1024;
|
2016-03-31 20:45:49 +02:00
|
|
|
}
|
|
|
|
else if ( quality >= 1 ) // Medium
|
|
|
|
{
|
2017-03-09 00:58:51 +01:00
|
|
|
width = 1024;
|
|
|
|
height = 512;
|
2016-03-31 20:45:49 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2017-03-09 00:58:51 +01:00
|
|
|
width = 512;
|
|
|
|
height = 256;
|
2016-03-31 20:45:49 +02:00
|
|
|
}
|
|
|
|
|
2017-03-09 00:58:51 +01:00
|
|
|
pMirrorBuffer = RwRasterCreate( width, height, 0, rwRASTERTYPECAMERATEXTURE );
|
|
|
|
pMirrorZBuffer = RwRasterCreate( width, height, 0, rwRASTERTYPEZBUFFER );
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
msaaValues[0] = oldMsaa[0];
|
|
|
|
msaaValues[1] = oldMsaa[1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
RwUInt32 (*orgGetMaxMultiSamplingLevels)();
|
|
|
|
RwUInt32 GetMaxMultiSamplingLevels()
|
|
|
|
{
|
|
|
|
RwUInt32 maxSamples = orgGetMaxMultiSamplingLevels();
|
|
|
|
RwUInt32 option;
|
|
|
|
_BitScanForward( (DWORD*)&option, maxSamples );
|
|
|
|
return option + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void (*orgChangeMultiSamplingLevels)(RwUInt32);
|
|
|
|
void ChangeMultiSamplingLevels( RwUInt32 level )
|
|
|
|
{
|
|
|
|
orgChangeMultiSamplingLevels( 1 << (level - 1) );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void (*orgSetMultiSamplingLevels)(RwUInt32);
|
|
|
|
void SetMultiSamplingLevels( RwUInt32 level )
|
|
|
|
{
|
|
|
|
orgSetMultiSamplingLevels( 1 << (level - 1) );
|
|
|
|
}
|
|
|
|
|
|
|
|
void MSAAText( char* buffer, const char*, DWORD level )
|
|
|
|
{
|
2017-04-09 20:25:19 +02:00
|
|
|
sprintf_s( buffer, 100, "%ux", 1 << level );
|
2016-03-31 20:45:49 +02:00
|
|
|
}
|
2016-01-11 23:55:25 +01:00
|
|
|
|
2016-04-22 21:42:10 +02:00
|
|
|
|
|
|
|
static RwInt32 numSavedVideoModes;
|
|
|
|
static RwInt32 (*orgGetNumVideoModes)();
|
|
|
|
RwInt32 GetNumVideoModes_Store()
|
|
|
|
{
|
|
|
|
return numSavedVideoModes = orgGetNumVideoModes();
|
|
|
|
}
|
|
|
|
|
|
|
|
RwInt32 GetNumVideoModes_Retrieve()
|
|
|
|
{
|
|
|
|
return numSavedVideoModes;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-04-22 20:45:33 +02:00
|
|
|
static void* (*orgMemMgrMalloc)(RwUInt32, RwUInt32);
|
|
|
|
void* CollisionData_MallocAndInit( RwUInt32 size, RwUInt32 hint )
|
|
|
|
{
|
|
|
|
CColData* mem = (CColData*)orgMemMgrMalloc( size, hint );
|
|
|
|
|
|
|
|
mem->m_bFlags = 0;
|
|
|
|
mem->m_dwNumShadowTriangles = mem->m_dwNumShadowVertices =0;
|
|
|
|
mem->m_pShadowVertices = mem->m_pShadowTriangles = nullptr;
|
|
|
|
|
|
|
|
return mem;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* (*orgNewAlloc)(size_t);
|
|
|
|
void* CollisionData_NewAndInit( size_t size )
|
|
|
|
{
|
|
|
|
CColData* mem = (CColData*)orgNewAlloc( size );
|
|
|
|
|
|
|
|
mem->m_bFlags = 0;
|
|
|
|
|
|
|
|
return mem;
|
|
|
|
}
|
|
|
|
|
2016-04-24 20:37:14 +02:00
|
|
|
|
|
|
|
static void (*orgEscalatorsUpdate)();
|
|
|
|
void UpdateEscalators()
|
|
|
|
{
|
|
|
|
if ( !CEscalator::ms_entitiesToRemove.empty() )
|
|
|
|
{
|
|
|
|
for ( auto it : CEscalator::ms_entitiesToRemove )
|
|
|
|
{
|
|
|
|
WorldRemove( it );
|
|
|
|
delete it;
|
|
|
|
}
|
|
|
|
CEscalator::ms_entitiesToRemove.clear();
|
|
|
|
}
|
|
|
|
orgEscalatorsUpdate();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-05-29 14:33:07 +02:00
|
|
|
static char** pStencilShadowsPad = *AddressByVersion<char***>(0x70FC4F, 0, 0x75E286, 0x758A47, 0x758937);
|
2016-04-24 22:00:51 +02:00
|
|
|
void StencilShadowAlloc( )
|
|
|
|
{
|
2017-05-14 00:23:06 +02:00
|
|
|
static char* pMemory = [] () {;
|
|
|
|
char* mem = static_cast<char*>( orgNewAlloc( 3 * 0x6000 ) );
|
|
|
|
pStencilShadowsPad[0] = mem;
|
|
|
|
pStencilShadowsPad[1] = mem+0x6000;
|
|
|
|
pStencilShadowsPad[2] = mem+(2*0x6000);
|
|
|
|
|
|
|
|
return mem;
|
|
|
|
} ();
|
2016-04-24 22:00:51 +02:00
|
|
|
}
|
|
|
|
|
2016-07-26 19:43:45 +02:00
|
|
|
RwBool GTARtAnimInterpolatorSetCurrentAnim(RtAnimInterpolator* animI, RtAnimAnimation* anim)
|
|
|
|
{
|
|
|
|
animI->pCurrentAnim = anim;
|
|
|
|
animI->currentTime = 0.0f;
|
|
|
|
|
|
|
|
const RtAnimInterpolatorInfo* info = anim->interpInfo;
|
|
|
|
animI->currentInterpKeyFrameSize = info->interpKeyFrameSize;
|
|
|
|
animI->currentAnimKeyFrameSize = info->animKeyFrameSize;
|
|
|
|
animI->keyFrameApplyCB = info->keyFrameApplyCB;
|
|
|
|
animI->keyFrameBlendCB = info->keyFrameBlendCB;
|
|
|
|
animI->keyFrameInterpolateCB = info->keyFrameInterpolateCB;
|
|
|
|
animI->keyFrameAddCB = info->keyFrameAddCB;
|
|
|
|
|
|
|
|
for ( RwInt32 i = 0; i < animI->numNodes; ++i )
|
2017-02-26 13:02:24 +01:00
|
|
|
{
|
|
|
|
RtAnimKeyFrameInterpolate( animI, rtANIMGETINTERPFRAME( animI, i ),
|
2016-07-26 19:43:45 +02:00
|
|
|
(RwChar*)anim->pFrames + i * animI->currentAnimKeyFrameSize,
|
|
|
|
(RwChar*)anim->pFrames + ( i + animI->numNodes) * animI->currentAnimKeyFrameSize, 0.0f );
|
2017-02-26 13:02:24 +01:00
|
|
|
}
|
2016-07-26 19:43:45 +02:00
|
|
|
|
|
|
|
animI->pNextFrame = (RwChar*)anim->pFrames + 2 * animI->currentAnimKeyFrameSize * animI->numNodes;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2017-09-12 18:04:42 +02:00
|
|
|
DWORD WINAPI CdStreamSetFilePointer( HANDLE hFile, uint32_t distanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod )
|
2016-11-20 15:54:59 +01:00
|
|
|
{
|
2017-09-12 18:04:42 +02:00
|
|
|
assert( lpDistanceToMoveHigh == nullptr );
|
|
|
|
|
2016-11-20 15:54:59 +01:00
|
|
|
LARGE_INTEGER li;
|
|
|
|
li.QuadPart = int64_t(distanceToMove) << 11;
|
2017-09-12 18:04:42 +02:00
|
|
|
return SetFilePointer( hFile, li.LowPart, &li.HighPart, dwMoveMethod );
|
2016-11-20 15:54:59 +01:00
|
|
|
}
|
2017-09-12 16:08:22 +02:00
|
|
|
static auto* const pCdStreamSetFilePointer = CdStreamSetFilePointer;
|
2016-11-20 15:54:59 +01:00
|
|
|
|
2016-04-24 22:00:51 +02:00
|
|
|
|
2017-03-10 16:19:05 +01:00
|
|
|
static signed int& LastTimeFireTruckCreated = **AddressByVersion<int**>(0x42131F + 2, 0, 0x42224D + 2);
|
|
|
|
static signed int& LastTimeAmbulanceCreated = **AddressByVersion<int**>(0x421319 + 2, 0, 0x422247 + 2);
|
|
|
|
static float& TimeNextMadDriverChaseCreated = **AddressByVersion<float**>(0x421369 + 2, 0, 0x42229D + 2);
|
|
|
|
static void (*orgCarCtrlReInit)();
|
|
|
|
void CarCtrlReInit_SilentPatch()
|
|
|
|
{
|
|
|
|
orgCarCtrlReInit();
|
|
|
|
LastTimeFireTruckCreated = 0;
|
|
|
|
LastTimeAmbulanceCreated = 0;
|
|
|
|
TimeNextMadDriverChaseCreated = (static_cast<float>(Int32Rand()) / INT32_MAX) * 600.0f + 600.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
static signed int* LastTimeFireTruckCreated_Newsteam;
|
|
|
|
static signed int* LastTimeAmbulanceCreated_Newsteam;
|
|
|
|
static float* TimeNextMadDriverChaseCreated_Newsteam;
|
|
|
|
void CarCtrlReInit_SilentPatch_Newsteam()
|
|
|
|
{
|
|
|
|
orgCarCtrlReInit();
|
|
|
|
*LastTimeFireTruckCreated_Newsteam = 0;
|
|
|
|
*LastTimeAmbulanceCreated_Newsteam = 0;
|
|
|
|
*TimeNextMadDriverChaseCreated_Newsteam = (static_cast<float>(Int32Rand()) / INT32_MAX) * 600.0f + 600.0f;
|
|
|
|
}
|
|
|
|
|
2017-03-20 22:52:41 +01:00
|
|
|
static void (*orgDrawScriptSpritesAndRectangles)(uint8_t);
|
|
|
|
void DrawScriptSpritesAndRectangles( uint8_t arg )
|
|
|
|
{
|
|
|
|
RwRenderStateSet( rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR );
|
|
|
|
orgDrawScriptSpritesAndRectangles( arg );
|
|
|
|
}
|
|
|
|
|
2017-06-20 18:33:31 +02:00
|
|
|
std::vector< std::pair<int32_t, bool> > doubleRearWheelsList;
|
2017-09-12 16:14:07 +02:00
|
|
|
bool ReadDoubleRearWheels(const wchar_t* pPath)
|
2017-03-25 13:46:07 +01:00
|
|
|
{
|
2017-09-12 16:14:07 +02:00
|
|
|
bool listedAny = false;
|
|
|
|
|
|
|
|
constexpr size_t SCRATCH_PAD_SIZE = 32767;
|
2017-03-25 13:46:07 +01:00
|
|
|
WideDelimStringReader reader( SCRATCH_PAD_SIZE );
|
|
|
|
|
|
|
|
GetPrivateProfileSectionW( L"DoubleRearWheels", reader.GetBuffer(), reader.GetSize(), pPath );
|
|
|
|
while ( const wchar_t* str = reader.GetString() )
|
|
|
|
{
|
2017-04-09 18:13:52 +02:00
|
|
|
wchar_t textLine[64];
|
2017-03-25 13:46:07 +01:00
|
|
|
wchar_t* context = nullptr;
|
|
|
|
wchar_t* token;
|
|
|
|
|
|
|
|
wcscpy_s( textLine, str );
|
|
|
|
token = wcstok_s( textLine, L"=", &context );
|
2017-04-09 18:13:52 +02:00
|
|
|
|
2017-06-20 18:33:31 +02:00
|
|
|
int32_t toList = wcstol( token, nullptr, 0 );
|
|
|
|
if ( toList <= 0 ) continue;
|
2017-04-09 18:13:52 +02:00
|
|
|
|
|
|
|
wchar_t* begin = wcstok_s( nullptr, L"=", &context );
|
|
|
|
if ( begin == nullptr ) continue;
|
|
|
|
|
|
|
|
wchar_t* end = nullptr;
|
|
|
|
bool value = wcstoul( begin, &end, 0 ) != 0;
|
|
|
|
if ( begin != end )
|
2017-03-25 13:46:07 +01:00
|
|
|
{
|
|
|
|
doubleRearWheelsList.emplace_back( toList, value );
|
2017-09-12 16:14:07 +02:00
|
|
|
listedAny = true;
|
2017-03-25 13:46:07 +01:00
|
|
|
}
|
|
|
|
}
|
2017-09-12 16:14:07 +02:00
|
|
|
return listedAny;
|
2017-03-25 13:46:07 +01:00
|
|
|
}
|
|
|
|
|
2018-02-10 20:04:12 +01:00
|
|
|
// 1.0 ONLY!
|
2017-03-25 13:46:07 +01:00
|
|
|
bool __stdcall CheckDoubleRWheelsList( void* modelInfo, uint8_t* handlingData )
|
|
|
|
{
|
|
|
|
static void* lastModelInfo = nullptr;
|
|
|
|
static bool lastResult = false;
|
|
|
|
|
|
|
|
if ( modelInfo == lastModelInfo ) return lastResult;
|
|
|
|
lastModelInfo = modelInfo;
|
|
|
|
|
2018-02-10 20:04:12 +01:00
|
|
|
const uint32_t numModelInfoPtrs = *(uint32_t*)0x4C5956+2;
|
|
|
|
int32_t modelID = std::distance( ms_modelInfoPtrs, std::find( ms_modelInfoPtrs, ms_modelInfoPtrs+numModelInfoPtrs, modelInfo ) );
|
2017-03-25 13:46:07 +01:00
|
|
|
|
|
|
|
auto it = std::find_if( doubleRearWheelsList.begin(), doubleRearWheelsList.end(), [modelID]( const auto& item ) {
|
|
|
|
return item.first == modelID;
|
|
|
|
} );
|
|
|
|
if ( it == doubleRearWheelsList.end() )
|
|
|
|
{
|
|
|
|
uint32_t flags = *(uint32_t*)(handlingData+0xCC);
|
|
|
|
lastResult = (flags & 0x20000000) != 0;
|
|
|
|
return lastResult;
|
|
|
|
}
|
|
|
|
|
|
|
|
lastResult = it->second;
|
|
|
|
return lastResult;
|
|
|
|
}
|
|
|
|
|
2017-04-09 23:17:31 +02:00
|
|
|
CVehicleModelInfo* (__thiscall *orgVehicleModelInfoCtor)(CVehicleModelInfo*);
|
|
|
|
CVehicleModelInfo* __fastcall VehicleModelInfoCtor(CVehicleModelInfo* me)
|
|
|
|
{
|
|
|
|
orgVehicleModelInfoCtor(me);
|
|
|
|
me->m_apPlateMaterials = nullptr;
|
2017-04-10 13:02:50 +02:00
|
|
|
me->m_dirtMaterials = nullptr;
|
|
|
|
me->m_numDirtMaterials = 0;
|
|
|
|
std::fill( std::begin( me->m_staticDirtMaterials ), std::end( me->m_staticDirtMaterials ), nullptr );
|
2017-04-09 23:17:31 +02:00
|
|
|
return me;
|
|
|
|
}
|
|
|
|
|
2018-02-10 20:04:12 +01:00
|
|
|
static void (*RemoveFromInterestingVehicleList)(CVehicle*) = AddressByVersion<void(*)(CVehicle*)>( 0x423ED0, Memory::PatternAndOffset("39 10 75 06 C7 00 00 00 00 00 83 C0 04 49 75 F0 5D C3", -10) );
|
2017-09-15 20:24:26 +02:00
|
|
|
static void (*orgRecordVehicleDeleted)(CVehicle*);
|
|
|
|
static void RecordVehicleDeleted_AndRemoveFromVehicleList( CVehicle* vehicle )
|
|
|
|
{
|
|
|
|
orgRecordVehicleDeleted( vehicle );
|
|
|
|
RemoveFromInterestingVehicleList( vehicle );
|
|
|
|
}
|
|
|
|
|
2017-09-19 00:47:38 +02:00
|
|
|
static int currDisplayedSplash_ForLastSplash = 0;
|
|
|
|
static void DoPCScreenChange_Mod()
|
|
|
|
{
|
2018-02-10 20:04:12 +01:00
|
|
|
static int& currDisplayedSplash = **AddressByVersion<int**>( 0x590B22 + 1, Memory::PatternAndOffset("8B 51 20 6A 01 6A 0C FF D2 83 C4 08 E8", 17 + 1) );
|
2017-09-19 00:47:38 +02:00
|
|
|
|
|
|
|
static const int numSplashes = [] () -> int {
|
2018-02-10 20:04:12 +01:00
|
|
|
RwTexture** begin = *AddressByVersion<RwTexture***>( 0x590CB4 + 1, Memory::PatternAndOffset("8D 49 00 83 3E 00 74 07 8B CE E8", -5 + 1) );
|
|
|
|
RwTexture** end = *AddressByVersion<RwTexture***>( 0x590CCE + 2, Memory::PatternAndOffset("8D 49 00 83 3E 00 74 07 8B CE E8", 18 + 2) );
|
2017-09-19 00:47:38 +02:00
|
|
|
return std::distance( begin, end );
|
|
|
|
} () - 1;
|
|
|
|
|
|
|
|
if ( currDisplayedSplash >= numSplashes )
|
|
|
|
{
|
|
|
|
currDisplayedSplash = 1;
|
|
|
|
currDisplayedSplash_ForLastSplash = numSplashes + 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
currDisplayedSplash_ForLastSplash = ++currDisplayedSplash;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-15 00:06:36 +01:00
|
|
|
static bool bUseAaronSun;
|
2017-09-19 17:46:42 +02:00
|
|
|
static CVector curVecToSun;
|
|
|
|
static void (*orgSetLightsWithTimeOfDayColour)( RpWorld* );
|
|
|
|
static void SetLightsWithTimeOfDayColour_SilentPatch( RpWorld* world )
|
|
|
|
{
|
2018-02-10 20:04:12 +01:00
|
|
|
static CVector* const VectorToSun = *AddressByVersion<CVector**>( 0x6FC5B7 + 3, Memory::PatternAndOffset("DC 0D ? ? ? ? 8D 04 40 8B 0C 85", 9 + 3) );
|
|
|
|
static int& CurrentStoredValue = **AddressByVersion<int**>( 0x6FC632 + 1, Memory::PatternAndOffset("84 C0 0F 84 AB 01 00 00 A1", 8 + 1) );
|
|
|
|
static CVector& vecDirnLightToSun = **AddressByVersion<CVector**>( 0x5BC040 + 2, Memory::PatternAndOffset("E8 ? ? ? ? D9 5D F8 D9 45 F8 D8 4D F4 D9 1D", 15 + 2) );
|
2017-09-19 17:46:42 +02:00
|
|
|
|
2017-09-19 21:40:48 +02:00
|
|
|
curVecToSun = bUseAaronSun ? VectorToSun[CurrentStoredValue] : vecDirnLightToSun;
|
2017-09-19 17:46:42 +02:00
|
|
|
orgSetLightsWithTimeOfDayColour( world );
|
|
|
|
}
|
|
|
|
|
2017-09-20 02:08:29 +02:00
|
|
|
// ============= CdStream data racing issue =============
|
|
|
|
|
|
|
|
struct CdStream
|
|
|
|
{
|
|
|
|
DWORD nSectorOffset;
|
|
|
|
DWORD nSectorsToRead;
|
|
|
|
LPVOID lpBuffer;
|
|
|
|
BYTE field_C;
|
|
|
|
BYTE bLocked;
|
|
|
|
BYTE bInUse;
|
|
|
|
BYTE field_F;
|
|
|
|
DWORD status;
|
2017-09-20 14:58:55 +02:00
|
|
|
union Sync {
|
|
|
|
HANDLE semaphore;
|
|
|
|
CONDITION_VARIABLE cv;
|
|
|
|
} sync;
|
2017-09-20 02:08:29 +02:00
|
|
|
HANDLE hFile;
|
|
|
|
OVERLAPPED overlapped;
|
|
|
|
};
|
|
|
|
|
|
|
|
static_assert(sizeof(CdStream) == 0x30, "Incorrect struct size: CdStream");
|
|
|
|
|
2017-09-20 14:58:55 +02:00
|
|
|
namespace CdStreamSync {
|
|
|
|
|
2017-09-20 02:08:29 +02:00
|
|
|
static CRITICAL_SECTION CdStreamCritSec;
|
|
|
|
|
2017-09-20 14:58:55 +02:00
|
|
|
// Function pointers for game to use
|
|
|
|
static CdStream::Sync (__stdcall *CdStreamInitializeSyncObject)();
|
|
|
|
static DWORD (__stdcall *CdStreamSyncOnObject)( CdStream* stream );
|
|
|
|
static void (__stdcall *CdStreamThreadOnObject)( CdStream* stream );
|
|
|
|
static void (__stdcall *CdStreamCloseObject)( CdStream::Sync* sync );
|
|
|
|
static void (__stdcall *CdStreamShutdownSyncObject)( CdStream* stream );
|
|
|
|
|
|
|
|
static void __stdcall CdStreamShutdownSyncObject_Stub( CdStream* stream, size_t idx )
|
2017-09-20 02:08:29 +02:00
|
|
|
{
|
2017-09-20 14:58:55 +02:00
|
|
|
CdStreamShutdownSyncObject( &stream[idx] );
|
2017-09-20 02:08:29 +02:00
|
|
|
}
|
|
|
|
|
2017-09-23 13:21:10 +02:00
|
|
|
// Fixed return values for GetOverlappedResult - stock code assumes "nonzero" equals 1, might not be future proof
|
|
|
|
static uint32_t WINAPI GetOverlappedResult_SilentPatch( HANDLE hFile, LPOVERLAPPED lpOverlapped, LPDWORD lpNumberOfBytesTransferred, BOOL bWait )
|
|
|
|
{
|
|
|
|
return GetOverlappedResult( hFile, lpOverlapped, lpNumberOfBytesTransferred, bWait ) != FALSE ? 0 : 254;
|
|
|
|
}
|
|
|
|
static auto* const pGetOverlappedResult = &GetOverlappedResult_SilentPatch;
|
|
|
|
|
|
|
|
|
2017-09-20 14:58:55 +02:00
|
|
|
namespace Sema
|
2017-09-20 02:08:29 +02:00
|
|
|
{
|
2017-09-20 14:58:55 +02:00
|
|
|
CdStream::Sync __stdcall InitializeSyncObject()
|
|
|
|
{
|
|
|
|
CdStream::Sync object;
|
|
|
|
object.semaphore = CreateSemaphore( nullptr, 0, 2, nullptr );
|
|
|
|
return object;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __stdcall ShutdownSyncObject( CdStream* stream )
|
|
|
|
{
|
|
|
|
CloseHandle( stream->sync.semaphore );
|
|
|
|
}
|
|
|
|
|
|
|
|
DWORD __stdcall CdStreamSync( CdStream* stream )
|
2017-09-20 02:08:29 +02:00
|
|
|
{
|
2017-09-20 14:58:55 +02:00
|
|
|
EnterCriticalSection( &CdStreamCritSec );
|
|
|
|
if ( stream->nSectorsToRead != 0 )
|
|
|
|
{
|
|
|
|
stream->bLocked = 1;
|
|
|
|
LeaveCriticalSection( &CdStreamCritSec );
|
|
|
|
WaitForSingleObject( stream->sync.semaphore, INFINITE );
|
|
|
|
EnterCriticalSection( &CdStreamCritSec );
|
|
|
|
}
|
|
|
|
stream->bInUse = 0;
|
2017-09-20 02:08:29 +02:00
|
|
|
LeaveCriticalSection( &CdStreamCritSec );
|
2017-09-20 14:58:55 +02:00
|
|
|
return stream->status;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __stdcall CdStreamThread( CdStream* stream )
|
|
|
|
{
|
2017-09-20 02:08:29 +02:00
|
|
|
EnterCriticalSection( &CdStreamCritSec );
|
2017-09-20 14:58:55 +02:00
|
|
|
stream->nSectorsToRead = 0;
|
|
|
|
if ( stream->bLocked != 0 )
|
|
|
|
{
|
|
|
|
ReleaseSemaphore( stream->sync.semaphore, 1, nullptr );
|
|
|
|
}
|
|
|
|
stream->bInUse = 0;
|
|
|
|
LeaveCriticalSection( &CdStreamCritSec );
|
2017-09-20 02:08:29 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-20 14:58:55 +02:00
|
|
|
namespace CV
|
2017-09-20 02:08:29 +02:00
|
|
|
{
|
2017-09-20 15:15:29 +02:00
|
|
|
namespace Funcs
|
|
|
|
{
|
|
|
|
static decltype(InitializeConditionVariable)* pInitializeConditionVariable = nullptr;
|
|
|
|
static decltype(SleepConditionVariableCS)* pSleepConditionVariableCS = nullptr;
|
|
|
|
static decltype(WakeConditionVariable)* pWakeConditionVariable = nullptr;
|
|
|
|
|
|
|
|
static bool TryInit()
|
|
|
|
{
|
|
|
|
const HMODULE kernelDLL = GetModuleHandle( TEXT("kernel32") );
|
|
|
|
assert( kernelDLL != nullptr );
|
|
|
|
pInitializeConditionVariable = (decltype(pInitializeConditionVariable))GetProcAddress( kernelDLL, "InitializeConditionVariable" );
|
|
|
|
pSleepConditionVariableCS = (decltype(pSleepConditionVariableCS))GetProcAddress( kernelDLL, "SleepConditionVariableCS" );
|
|
|
|
pWakeConditionVariable = (decltype(pWakeConditionVariable))GetProcAddress( kernelDLL, "WakeConditionVariable" );
|
|
|
|
|
|
|
|
return pInitializeConditionVariable != nullptr && pSleepConditionVariableCS != nullptr && pWakeConditionVariable != nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2017-09-20 14:58:55 +02:00
|
|
|
CdStream::Sync __stdcall InitializeSyncObject()
|
2017-09-20 02:08:29 +02:00
|
|
|
{
|
2017-09-20 14:58:55 +02:00
|
|
|
CdStream::Sync object;
|
2017-09-20 15:15:29 +02:00
|
|
|
Funcs::pInitializeConditionVariable( &object.cv );
|
2017-09-20 14:58:55 +02:00
|
|
|
return object;
|
2017-09-20 02:08:29 +02:00
|
|
|
}
|
|
|
|
|
2017-09-20 14:58:55 +02:00
|
|
|
void __stdcall ShutdownSyncObject( CdStream* stream )
|
2017-09-20 02:08:29 +02:00
|
|
|
{
|
2017-09-20 14:58:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
DWORD __stdcall CdStreamSync( CdStream* stream )
|
|
|
|
{
|
|
|
|
EnterCriticalSection( &CdStreamCritSec );
|
|
|
|
while ( stream->nSectorsToRead != 0 )
|
|
|
|
{
|
2017-09-20 15:15:29 +02:00
|
|
|
Funcs::pSleepConditionVariableCS( &stream->sync.cv, &CdStreamCritSec, INFINITE );
|
2017-09-20 14:58:55 +02:00
|
|
|
}
|
|
|
|
stream->bInUse = 0;
|
|
|
|
LeaveCriticalSection( &CdStreamCritSec );
|
|
|
|
return stream->status;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __stdcall CdStreamThread( CdStream* stream )
|
|
|
|
{
|
|
|
|
EnterCriticalSection( &CdStreamCritSec );
|
|
|
|
stream->nSectorsToRead = 0;
|
2017-09-20 15:15:29 +02:00
|
|
|
Funcs::pWakeConditionVariable( &stream->sync.cv );
|
2017-09-20 14:58:55 +02:00
|
|
|
stream->bInUse = 0;
|
|
|
|
LeaveCriticalSection( &CdStreamCritSec );
|
2017-09-20 02:08:29 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-20 14:58:55 +02:00
|
|
|
static void (*orgCdStreamInitThread)();
|
|
|
|
static void CdStreamInitThread()
|
2017-09-20 02:08:29 +02:00
|
|
|
{
|
2017-09-23 13:21:10 +02:00
|
|
|
if ( ModCompat::bCdStreamFallBackForOldML != true && CV::Funcs::TryInit() )
|
2017-09-20 14:58:55 +02:00
|
|
|
{
|
|
|
|
CdStreamInitializeSyncObject = CV::InitializeSyncObject;
|
|
|
|
CdStreamShutdownSyncObject = CV::ShutdownSyncObject;
|
|
|
|
CdStreamSyncOnObject = CV::CdStreamSync;
|
|
|
|
CdStreamThreadOnObject = CV::CdStreamThread;
|
|
|
|
}
|
2017-09-20 15:15:29 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
CdStreamInitializeSyncObject = Sema::InitializeSyncObject;
|
|
|
|
CdStreamShutdownSyncObject = Sema::ShutdownSyncObject;
|
|
|
|
CdStreamSyncOnObject = Sema::CdStreamSync;
|
|
|
|
CdStreamThreadOnObject = Sema::CdStreamThread;
|
|
|
|
}
|
2017-09-20 14:58:55 +02:00
|
|
|
|
|
|
|
InitializeCriticalSectionAndSpinCount( &CdStreamCritSec, 10 );
|
2017-09-20 15:00:21 +02:00
|
|
|
|
2017-09-26 18:03:13 +02:00
|
|
|
FLAUtils::SetCdStreamWakeFunction( []( CdStream* pStream ) {
|
|
|
|
CdStreamThreadOnObject( pStream );
|
|
|
|
} );
|
|
|
|
|
2017-09-20 15:00:21 +02:00
|
|
|
orgCdStreamInitThread();
|
2017-09-20 14:58:55 +02:00
|
|
|
}
|
|
|
|
|
2017-09-20 02:08:29 +02:00
|
|
|
}
|
|
|
|
|
2017-09-23 19:34:28 +02:00
|
|
|
// Dancing timers fix
|
|
|
|
static long UtilsVariablesInit = 0;
|
|
|
|
static LARGE_INTEGER UtilsStartTime;
|
2017-12-22 00:13:28 +01:00
|
|
|
static LARGE_INTEGER UtilsFrequency;
|
2017-09-23 19:34:28 +02:00
|
|
|
static BOOL WINAPI AudioUtilsFrequency( PLARGE_INTEGER lpFrequency )
|
|
|
|
{
|
2017-12-22 00:13:28 +01:00
|
|
|
::QueryPerformanceFrequency( &UtilsFrequency );
|
|
|
|
UtilsFrequency.QuadPart /= 1000;
|
|
|
|
lpFrequency->QuadPart = UtilsFrequency.QuadPart;
|
2017-09-23 19:34:28 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
static auto* const pAudioUtilsFrequency = &AudioUtilsFrequency;
|
|
|
|
|
|
|
|
static int64_t AudioUtilsGetStartTime()
|
|
|
|
{
|
|
|
|
QueryPerformanceCounter( &UtilsStartTime );
|
|
|
|
|
|
|
|
_InterlockedExchange( &UtilsVariablesInit, 1 );
|
|
|
|
return UtilsStartTime.QuadPart;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int64_t AudioUtilsGetCurrentTimeInMs()
|
|
|
|
{
|
|
|
|
if ( _InterlockedCompareExchange( &UtilsVariablesInit, 0, 0 ) == 0 )
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
LARGE_INTEGER currentTime;
|
|
|
|
QueryPerformanceCounter( ¤tTime );
|
2017-12-22 00:13:28 +01:00
|
|
|
return (currentTime.QuadPart - UtilsStartTime.QuadPart) / UtilsFrequency.QuadPart;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Minimal HUD changes
|
|
|
|
static CRGBA* __fastcall SetRGBA_FloatAlpha( CRGBA* rgba, void*, uint8_t red, uint8_t green, uint8_t blue, float alpha )
|
|
|
|
{
|
|
|
|
rgba->r = red;
|
|
|
|
rgba->g = green;
|
|
|
|
rgba->b = blue;
|
|
|
|
rgba->a = static_cast<uint8_t>(alpha);
|
|
|
|
return rgba;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void RenderXLUSprite_FloatAlpha( float arg1, float arg2, float arg3, float arg4, float arg5, uint8_t red, uint8_t green, uint8_t blue, int16_t mult, float arg10, float alpha, uint8_t arg12, uint8_t arg13 )
|
|
|
|
{
|
|
|
|
RenderOneXLUSprite( arg1, arg2, arg3, arg4, arg5, red, green, blue, mult, arg10, static_cast<uint8_t>(alpha), arg12, arg13 );
|
2017-09-23 19:34:28 +02:00
|
|
|
}
|
|
|
|
|
2017-12-26 01:59:22 +01:00
|
|
|
// 6 directionals on Medium/High/Very High Visual FX
|
|
|
|
int32_t GetMaxExtraDirectionals( uint32_t areaID )
|
|
|
|
{
|
|
|
|
return areaID != 0 || GetFxQuality() >= 1 ? 6 : 4;
|
|
|
|
}
|
|
|
|
|
2018-01-15 23:01:57 +01:00
|
|
|
static CVehicle* FindPlayerVehicle_RCWrap( int playerID, bool )
|
|
|
|
{
|
|
|
|
return FindPlayerVehicle( playerID, true );
|
|
|
|
}
|
|
|
|
|
2018-01-28 14:21:27 +01:00
|
|
|
// ============= Credits! =============
|
|
|
|
namespace Credits
|
|
|
|
{
|
|
|
|
static void (*PrintCreditText)(float scaleX, float scaleY, const char* text, unsigned int& pos, float timeOffset, bool isHeader);
|
2018-04-28 16:44:36 +02:00
|
|
|
static void (*PrintCreditText_Hooked)(float scaleX, float scaleY, const char* text, unsigned int& pos, float timeOffset, bool isHeader);
|
2018-01-28 14:21:27 +01:00
|
|
|
|
|
|
|
static void PrintCreditSpace( float scale, unsigned int& pos )
|
|
|
|
{
|
|
|
|
pos += static_cast<unsigned int>( scale * 25.0f );
|
|
|
|
}
|
|
|
|
|
|
|
|
constexpr char xvChar(const char ch)
|
|
|
|
{
|
2018-04-28 16:44:36 +02:00
|
|
|
constexpr uint8_t xv = SILENTPATCH_REVISION_ID;
|
2018-01-28 14:21:27 +01:00
|
|
|
return ch ^ xv;
|
|
|
|
}
|
|
|
|
|
|
|
|
constexpr char operator "" _xv(const char ch)
|
|
|
|
{
|
|
|
|
return xvChar(ch);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void PrintSPCredits( float scaleX, float scaleY, const char* text, unsigned int& pos, float timeOffset, bool isHeader )
|
|
|
|
{
|
|
|
|
// Original text we intercepted
|
2018-04-28 16:44:36 +02:00
|
|
|
PrintCreditText_Hooked( scaleX, scaleY, text, pos, timeOffset, isHeader );
|
2018-01-28 14:21:27 +01:00
|
|
|
PrintCreditSpace( 1.5f, pos );
|
|
|
|
|
|
|
|
{
|
|
|
|
char spText[] = { 'A'_xv, 'N'_xv, 'D'_xv, '\0'_xv };
|
|
|
|
|
|
|
|
for ( auto& ch : spText ) ch = xvChar(ch);
|
|
|
|
PrintCreditText( scaleX, scaleY, spText, pos, timeOffset, true );
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintCreditSpace( 1.5f, pos );
|
|
|
|
|
|
|
|
{
|
|
|
|
char spText[] = { 'A'_xv, 'd'_xv, 'r'_xv, 'i'_xv, 'a'_xv, 'n'_xv, ' '_xv, '\"'_xv, 'S'_xv, 'i'_xv, 'l'_xv, 'e'_xv, 'n'_xv, 't'_xv, '\"'_xv, ' '_xv,
|
|
|
|
'Z'_xv, 'd'_xv, 'a'_xv, 'n'_xv, 'o'_xv, 'w'_xv, 'i'_xv, 'c'_xv, 'z'_xv, '\0'_xv };
|
|
|
|
|
|
|
|
for ( auto& ch : spText ) ch = xvChar(ch);
|
|
|
|
PrintCreditText( scaleX, scaleY, spText, pos, timeOffset, false );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-17 13:59:44 +01:00
|
|
|
// ============= Bicycle fire fix =============
|
|
|
|
namespace BicycleFire
|
|
|
|
{
|
|
|
|
CPed* GetVehicleDriver( const CVehicle* vehicle )
|
|
|
|
{
|
|
|
|
return vehicle->GetDriver();
|
|
|
|
}
|
|
|
|
|
|
|
|
void __fastcall DoStuffToGoOnFire_NullAndPlayerCheck( CPed* ped )
|
|
|
|
{
|
|
|
|
if ( ped != nullptr && ped->IsPlayer() )
|
|
|
|
{
|
|
|
|
static_cast<CPlayerPed*>(ped)->DoStuffToGoOnFire();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-23 19:34:28 +02:00
|
|
|
|
2018-03-28 21:23:16 +02:00
|
|
|
// ============= Keyboard latency input fix =============
|
|
|
|
namespace KeyboardInputFix
|
|
|
|
{
|
|
|
|
static void* NewKeyState;
|
|
|
|
static void* OldKeyState;
|
|
|
|
static void* TempKeyState;
|
|
|
|
static size_t objSize;
|
|
|
|
static void (__fastcall *orgClearSimButtonPressCheckers)(void*);
|
|
|
|
void __fastcall ClearSimButtonPressCheckers(void* pThis)
|
|
|
|
{
|
|
|
|
memcpy( OldKeyState, NewKeyState, objSize );
|
|
|
|
memcpy( NewKeyState, TempKeyState, objSize );
|
|
|
|
|
|
|
|
orgClearSimButtonPressCheckers(pThis);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-24 23:59:40 +02:00
|
|
|
// ============= handling.cfg name matching fix =============
|
|
|
|
namespace HandlingNameLoadFix
|
|
|
|
{
|
|
|
|
void strncpy_Fix( const char** destination, const char* source, size_t )
|
|
|
|
{
|
|
|
|
*destination = source;
|
|
|
|
}
|
|
|
|
|
|
|
|
int strncmp_Fix( const char* str1, const char** str2, size_t )
|
|
|
|
{
|
|
|
|
return strcmp( str1, *str2 );
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-03-28 21:23:16 +02:00
|
|
|
|
2017-09-23 19:34:28 +02:00
|
|
|
#ifndef NDEBUG
|
|
|
|
|
|
|
|
// ============= QPC spoof for verifying high timer issues =============
|
|
|
|
namespace FakeQPC
|
|
|
|
{
|
|
|
|
static int64_t AddedTime;
|
|
|
|
static BOOL WINAPI FakeQueryPerformanceCounter(PLARGE_INTEGER lpPerformanceCount)
|
|
|
|
{
|
|
|
|
const BOOL result = ::QueryPerformanceCounter( lpPerformanceCount );
|
|
|
|
lpPerformanceCount->QuadPart += AddedTime;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2017-04-10 12:32:31 +02:00
|
|
|
#if MEM_VALIDATORS
|
|
|
|
|
|
|
|
#include <intrin.h>
|
|
|
|
|
|
|
|
// Validator for static allocations
|
|
|
|
void PutStaticValidator( uintptr_t begin, uintptr_t end )
|
|
|
|
{
|
|
|
|
uint8_t* a = (uint8_t*)begin;
|
|
|
|
uint8_t* b = (uint8_t*)end;
|
|
|
|
|
|
|
|
std::fill( a, b, uint8_t(0xCC) );
|
|
|
|
}
|
|
|
|
|
|
|
|
void* malloc_validator(size_t size)
|
|
|
|
{
|
|
|
|
return _malloc_dbg( size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() );
|
|
|
|
}
|
|
|
|
|
|
|
|
void* realloc_validator(void* ptr, size_t size)
|
|
|
|
{
|
|
|
|
return _realloc_dbg( ptr, size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() );
|
|
|
|
}
|
|
|
|
|
|
|
|
void* calloc_validator(size_t count, size_t size)
|
|
|
|
{
|
|
|
|
return _calloc_dbg( count, size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() );
|
|
|
|
}
|
|
|
|
|
|
|
|
void free_validator(void* ptr)
|
|
|
|
{
|
|
|
|
_free_dbg(ptr, _NORMAL_BLOCK);
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t _msize_validator(void* ptr)
|
|
|
|
{
|
|
|
|
return _msize_dbg(ptr, _NORMAL_BLOCK);
|
|
|
|
}
|
|
|
|
|
|
|
|
void* _new(size_t size)
|
|
|
|
{
|
|
|
|
return _malloc_dbg( size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() );
|
|
|
|
}
|
|
|
|
|
|
|
|
void _delete(void* ptr)
|
|
|
|
{
|
|
|
|
_free_dbg(ptr, _NORMAL_BLOCK);
|
|
|
|
}
|
|
|
|
|
|
|
|
class CDebugMemoryMgr
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
static void* Malloc(size_t size)
|
|
|
|
{
|
|
|
|
return _malloc_dbg( size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void Free(void* ptr)
|
|
|
|
{
|
|
|
|
_free_dbg(ptr, _NORMAL_BLOCK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* Realloc(void* ptr, size_t size)
|
|
|
|
{
|
|
|
|
return _realloc_dbg( ptr, size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* Calloc(size_t count, size_t size)
|
|
|
|
{
|
|
|
|
return _calloc_dbg( count, size, _NORMAL_BLOCK, "EXE", (uintptr_t)_ReturnAddress() );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* MallocAlign(size_t size, size_t align)
|
|
|
|
{
|
|
|
|
return _aligned_malloc_dbg( size, align, "EXE", (uintptr_t)_ReturnAddress() );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void AlignedFree(void* ptr)
|
|
|
|
{
|
|
|
|
_aligned_free_dbg(ptr);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
void InstallMemValidator()
|
|
|
|
{
|
|
|
|
using namespace Memory;
|
|
|
|
|
|
|
|
// TEST: Validate memory
|
|
|
|
InjectHook( 0x824257, malloc_validator, PATCH_JUMP );
|
|
|
|
InjectHook( 0x824269, realloc_validator, PATCH_JUMP );
|
|
|
|
InjectHook( 0x824416, calloc_validator, PATCH_JUMP );
|
|
|
|
InjectHook( 0x82413F, free_validator, PATCH_JUMP );
|
|
|
|
InjectHook( 0x828C4A, _msize_validator, PATCH_JUMP );
|
|
|
|
|
|
|
|
InjectHook( 0x82119A, _new, PATCH_JUMP );
|
|
|
|
InjectHook( 0x8214BD, _delete, PATCH_JUMP );
|
|
|
|
|
|
|
|
InjectHook( 0x72F420, &CDebugMemoryMgr::Malloc, PATCH_JUMP );
|
|
|
|
InjectHook( 0x72F430, &CDebugMemoryMgr::Free, PATCH_JUMP );
|
|
|
|
InjectHook( 0x72F440, &CDebugMemoryMgr::Realloc, PATCH_JUMP );
|
|
|
|
InjectHook( 0x72F460, &CDebugMemoryMgr::Calloc, PATCH_JUMP );
|
|
|
|
InjectHook( 0x72F4C0, &CDebugMemoryMgr::MallocAlign, PATCH_JUMP );
|
|
|
|
InjectHook( 0x72F4F0, &CDebugMemoryMgr::AlignedFree, PATCH_JUMP );
|
|
|
|
|
|
|
|
|
|
|
|
PutStaticValidator( 0xAAE950, 0xB4C310 ); // CStore
|
|
|
|
PutStaticValidator( 0xA9AE00, 0xA9AE58 ); // fx_c
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Hooks
|
|
|
|
void __declspec(naked) LightMaterialsFix()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
mov [esi], edi
|
|
|
|
mov ebx, [ecx]
|
|
|
|
lea esi, [edx+4]
|
|
|
|
mov [ebx+4], esi
|
|
|
|
mov edi, [esi]
|
|
|
|
mov [ebx+8], edi
|
|
|
|
add esi, 4
|
|
|
|
mov [ebx+12], esi
|
|
|
|
mov edi, [esi]
|
|
|
|
mov [ebx+16], edi
|
|
|
|
add ebx, 20
|
|
|
|
mov [ecx], ebx
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) UserTracksFix()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
push [esp+4]
|
|
|
|
call SetVolume
|
|
|
|
mov ecx, [pUserTracksStuff]
|
|
|
|
mov byte ptr [ecx+0Dh], 1
|
|
|
|
call InitializeUtrax
|
|
|
|
retn 4
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) UserTracksFix_Steam()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
push [esp+4]
|
|
|
|
call SetVolume
|
|
|
|
mov ecx, [pUserTracksStuff]
|
|
|
|
mov byte ptr [ecx+5], 1
|
|
|
|
call InitializeUtrax
|
|
|
|
retn 4
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) ResetAlphaFuncRefAfterRender()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
mov edx, [rwengine]
|
|
|
|
mov edx, [edx]
|
|
|
|
mov ecx, [esp+7Ch-74h]
|
|
|
|
push ecx
|
|
|
|
push rwRENDERSTATEALPHATESTFUNCTIONREF
|
|
|
|
call dword ptr [edx+20h]
|
|
|
|
add esp, 8
|
|
|
|
pop edi
|
|
|
|
pop esi
|
|
|
|
add esp, 74h
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) ResetAlphaFuncRefAfterRender_Steam()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
mov edx, [rwengine]
|
|
|
|
mov edx, [edx]
|
|
|
|
mov ecx, [esp+80h-74h]
|
|
|
|
push ecx
|
|
|
|
push rwRENDERSTATEALPHATESTFUNCTIONREF
|
|
|
|
call dword ptr [edx+20h]
|
|
|
|
add esp, 8
|
|
|
|
pop edi
|
|
|
|
pop esi
|
|
|
|
add esp, 78h
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* PlaneAtomicRendererSetup_JumpBack = AddressByVersion<void*>(0x4C7986, 0x4C7A06, 0x4D2275);
|
|
|
|
static void* RenderVehicleHiDetailAlphaCB_BigVehicle = AddressByVersion<void*>(0x734370, 0x734BA0, 0x76E400);
|
|
|
|
static void* RenderVehicleHiDetailCB_BigVehicle = AddressByVersion<void*>(0x733420, 0x733C50, 0x76D6C0);
|
|
|
|
void __declspec(naked) PlaneAtomicRendererSetup()
|
|
|
|
{
|
|
|
|
static const char aStaticProp[] = "static_prop";
|
|
|
|
static const char aMovingProp[] = "moving_prop";
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
mov eax, [esi+4]
|
|
|
|
push eax
|
|
|
|
call GetFrameNodeName
|
|
|
|
//push eax
|
|
|
|
mov [esp+8+8], eax
|
|
|
|
push offset aStaticProp
|
|
|
|
push eax
|
2018-04-12 23:56:25 +02:00
|
|
|
call _stricmp
|
|
|
|
add esp, 0Ch
|
2015-04-22 15:20:40 +02:00
|
|
|
test eax, eax
|
|
|
|
jz PlaneAtomicRendererSetup_Alpha
|
|
|
|
push offset aMovingProp
|
2018-04-12 23:56:25 +02:00
|
|
|
push [esp+12+4]
|
|
|
|
call _stricmp
|
|
|
|
add esp, 8
|
2015-04-22 15:20:40 +02:00
|
|
|
test eax, eax
|
|
|
|
jnz PlaneAtomicRendererSetup_NoAlpha
|
|
|
|
|
|
|
|
PlaneAtomicRendererSetup_Alpha:
|
|
|
|
push [RenderVehicleHiDetailAlphaCB_BigVehicle]
|
|
|
|
jmp PlaneAtomicRendererSetup_Return
|
|
|
|
|
|
|
|
PlaneAtomicRendererSetup_NoAlpha:
|
|
|
|
push [RenderVehicleHiDetailCB_BigVehicle]
|
|
|
|
|
|
|
|
PlaneAtomicRendererSetup_Return:
|
|
|
|
jmp PlaneAtomicRendererSetup_JumpBack
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int nCachedCRC;
|
|
|
|
|
|
|
|
static void* RenderVehicleHiDetailCB = AddressByVersion<void*>(0x733240, 0x733A70, 0x76D4C0);
|
|
|
|
static void* RenderVehicleHiDetailAlphaCB = AddressByVersion<void*>(0x733F80, 0x7347B0, 0x76DFE0);
|
|
|
|
static void* RenderHeliRotorAlphaCB = AddressByVersion<void*>(0x7340B0, 0x7348E0, 0x76E110);
|
|
|
|
static void* RenderHeliTailRotorAlphaCB = AddressByVersion<void*>(0x734170, 0x7349A0, 0x76E1E0);
|
|
|
|
static void* HunterTest_JumpBack = AddressByVersion<void*>(0x4C7914, 0x4C7994, 0x4D2203);
|
|
|
|
void __declspec(naked) HunterTest()
|
|
|
|
{
|
|
|
|
static const char aDoorDummy[] = "door_lf_ok";
|
|
|
|
static const char aStaticRotor[] = "static_rotor";
|
|
|
|
static const char aStaticRotor2[] = "static_rotor2";
|
|
|
|
static const char aWindscreen[] = "windscreen";
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
setnz al
|
|
|
|
movzx di, al
|
|
|
|
|
|
|
|
push offset aWindscreen
|
|
|
|
push ebp
|
2018-04-12 23:56:25 +02:00
|
|
|
call _stricmp
|
|
|
|
add esp, 8
|
2015-04-22 15:20:40 +02:00
|
|
|
test eax, eax
|
|
|
|
jz HunterTest_RegularAlpha
|
|
|
|
|
|
|
|
push offset aStaticRotor2
|
|
|
|
push ebp
|
2018-04-12 23:56:25 +02:00
|
|
|
call _stricmp
|
|
|
|
add esp, 8
|
2015-04-22 15:20:40 +02:00
|
|
|
test eax, eax
|
|
|
|
jz HunterTest_StaticRotor2AlphaSet
|
|
|
|
|
|
|
|
push offset aStaticRotor
|
|
|
|
push ebp
|
2018-04-12 23:56:25 +02:00
|
|
|
call _stricmp
|
|
|
|
add esp, 8
|
2015-04-22 15:20:40 +02:00
|
|
|
test eax, eax
|
|
|
|
jz HunterTest_StaticRotorAlphaSet
|
|
|
|
|
|
|
|
test di, di
|
|
|
|
jnz HunterTest_DoorTest
|
|
|
|
|
|
|
|
push [RenderVehicleHiDetailCB]
|
|
|
|
jmp HunterTest_JumpBack
|
|
|
|
|
|
|
|
HunterTest_DoorTest:
|
|
|
|
cmp nCachedCRC, 0x45D0B41C
|
|
|
|
jnz HunterTest_RegularAlpha
|
|
|
|
push offset aDoorDummy
|
|
|
|
push ebp
|
2018-04-12 23:56:25 +02:00
|
|
|
call _stricmp
|
|
|
|
add esp, 8
|
2015-04-22 15:20:40 +02:00
|
|
|
test eax, eax
|
|
|
|
jnz HunterTest_RegularAlpha
|
|
|
|
push RenderVehicleHiDetailAlphaCB_HunterDoor
|
|
|
|
jmp HunterTest_JumpBack
|
|
|
|
|
|
|
|
HunterTest_RegularAlpha:
|
|
|
|
push [RenderVehicleHiDetailAlphaCB]
|
|
|
|
jmp HunterTest_JumpBack
|
|
|
|
|
|
|
|
HunterTest_StaticRotorAlphaSet:
|
|
|
|
push [RenderHeliRotorAlphaCB]
|
|
|
|
jmp HunterTest_JumpBack
|
|
|
|
|
|
|
|
HunterTest_StaticRotor2AlphaSet:
|
|
|
|
push [RenderHeliTailRotorAlphaCB]
|
|
|
|
jmp HunterTest_JumpBack
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* CacheCRC32_JumpBack = AddressByVersion<void*>(0x4C7B10, 0x4C7B90, 0x4D2400);
|
|
|
|
void __declspec(naked) CacheCRC32()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
mov eax, [ecx+4]
|
|
|
|
mov nCachedCRC, eax
|
|
|
|
jmp CacheCRC32_JumpBack
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void* const TrailerDoubleRWheelsFix_ReturnFalse = AddressByVersion<void*>(0x4C9333, 0x4C9533, 0x4D3C59);
|
|
|
|
static void* const TrailerDoubleRWheelsFix_ReturnTrue = AddressByVersion<void*>(0x4C9235, 0x4C9435, 0x4D3B59);
|
|
|
|
void __declspec(naked) TrailerDoubleRWheelsFix()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
cmp [edi]CVehicleModelInfo.m_dwType, VEHICLE_TRAILER
|
|
|
|
je TrailerDoubleRWheelsFix_DoWheels
|
|
|
|
cmp eax, 2
|
|
|
|
je TrailerDoubleRWheelsFix_False
|
|
|
|
cmp eax, 5
|
|
|
|
je TrailerDoubleRWheelsFix_False
|
|
|
|
|
|
|
|
TrailerDoubleRWheelsFix_DoWheels:
|
|
|
|
jmp TrailerDoubleRWheelsFix_ReturnTrue
|
|
|
|
|
|
|
|
TrailerDoubleRWheelsFix_False:
|
|
|
|
jmp TrailerDoubleRWheelsFix_ReturnFalse
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) TrailerDoubleRWheelsFix2()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
add esp, 18h
|
|
|
|
mov eax, [ebx]
|
|
|
|
mov eax, [esi+eax+4]
|
|
|
|
jmp TrailerDoubleRWheelsFix
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) TrailerDoubleRWheelsFix_Steam()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
cmp [esi]CVehicleModelInfo.m_dwType, VEHICLE_TRAILER
|
|
|
|
je TrailerDoubleRWheelsFix_DoWheels
|
|
|
|
cmp eax, 2
|
|
|
|
je TrailerDoubleRWheelsFix_False
|
|
|
|
cmp eax, 5
|
|
|
|
je TrailerDoubleRWheelsFix_False
|
|
|
|
|
|
|
|
TrailerDoubleRWheelsFix_DoWheels:
|
|
|
|
jmp TrailerDoubleRWheelsFix_ReturnTrue
|
|
|
|
|
|
|
|
TrailerDoubleRWheelsFix_False:
|
|
|
|
jmp TrailerDoubleRWheelsFix_ReturnFalse
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) TrailerDoubleRWheelsFix2_Steam()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
add esp, 18h
|
|
|
|
mov eax, [ebp]
|
|
|
|
mov eax, [ebx+eax+4]
|
|
|
|
jmp TrailerDoubleRWheelsFix_Steam
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-26 00:14:39 +01:00
|
|
|
static void* LoadFLAC_JumpBack = AddressByVersion<void*>(0x4F3743, Memory::GetVersion().version == 1 ? (*(BYTE*)0x4F3A50 == 0x6A ? 0x4F3BA3 : 0x5B6B81) : 0, 0x4FFC3F);
|
2015-04-22 15:20:40 +02:00
|
|
|
void __declspec(naked) LoadFLAC()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
jz LoadFLAC_WindowsMedia
|
|
|
|
sub ebp, 2
|
|
|
|
jnz LoadFLAC_Return
|
|
|
|
push esi
|
|
|
|
call DecoderCtor
|
|
|
|
jmp LoadFLAC_Success
|
|
|
|
|
|
|
|
LoadFLAC_WindowsMedia:
|
|
|
|
jmp LoadFLAC_JumpBack
|
|
|
|
|
|
|
|
LoadFLAC_Success:
|
|
|
|
test eax, eax
|
|
|
|
mov [esp+20h+4], eax
|
|
|
|
jnz LoadFLAC_Return_NoDelete
|
|
|
|
|
|
|
|
LoadFLAC_Return:
|
|
|
|
mov ecx, esi
|
|
|
|
call CAEDataStreamOld::~CAEDataStreamOld
|
|
|
|
push esi
|
|
|
|
call GTAdelete
|
|
|
|
add esp, 4
|
|
|
|
|
|
|
|
LoadFLAC_Return_NoDelete:
|
|
|
|
mov eax, [esp+20h+4]
|
|
|
|
mov ecx, [esp+20h-0Ch]
|
|
|
|
pop esi
|
|
|
|
pop ebp
|
|
|
|
pop edi
|
|
|
|
pop ebx
|
|
|
|
mov fs:0, ecx
|
|
|
|
add esp, 10h
|
|
|
|
retn 4
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 1.01 securom butchered this func, might not be reliable
|
|
|
|
void __declspec(naked) LoadFLAC_11()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
jz LoadFLAC_WindowsMedia
|
|
|
|
sub ebp, 2
|
|
|
|
jnz LoadFLAC_Return
|
|
|
|
push esi
|
|
|
|
call DecoderCtor
|
|
|
|
jmp LoadFLAC_Success
|
|
|
|
|
|
|
|
LoadFLAC_WindowsMedia:
|
|
|
|
jmp LoadFLAC_JumpBack
|
|
|
|
|
|
|
|
LoadFLAC_Success:
|
|
|
|
test eax, eax
|
|
|
|
mov [esp+20h+4], eax
|
|
|
|
jnz LoadFLAC_Return_NoDelete
|
|
|
|
|
|
|
|
LoadFLAC_Return:
|
|
|
|
mov ecx, esi
|
|
|
|
call CAEDataStreamNew::~CAEDataStreamNew
|
|
|
|
push esi
|
|
|
|
call GTAdelete
|
|
|
|
add esp, 4
|
|
|
|
|
|
|
|
LoadFLAC_Return_NoDelete:
|
|
|
|
mov eax, [esp+20h+4]
|
|
|
|
mov ecx, [esp+20h-0Ch]
|
|
|
|
pop esi
|
|
|
|
pop ebp
|
|
|
|
pop edi
|
|
|
|
pop ebx
|
|
|
|
mov fs:0, ecx
|
|
|
|
add esp, 10h
|
|
|
|
retn 4
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void __declspec(naked) LoadFLAC_Steam()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
jz LoadFLAC_WindowsMedia
|
|
|
|
sub ebp, 2
|
|
|
|
jnz LoadFLAC_Return
|
|
|
|
push esi
|
|
|
|
call DecoderCtor
|
|
|
|
jmp LoadFLAC_Success
|
|
|
|
|
|
|
|
LoadFLAC_WindowsMedia:
|
|
|
|
jmp LoadFLAC_JumpBack
|
|
|
|
|
|
|
|
LoadFLAC_Success:
|
|
|
|
test eax, eax
|
|
|
|
mov [esp+20h+4], eax
|
|
|
|
jnz LoadFLAC_Return_NoDelete
|
|
|
|
|
|
|
|
LoadFLAC_Return:
|
|
|
|
mov ecx, esi
|
|
|
|
call CAEDataStreamOld::~CAEDataStreamOld
|
|
|
|
push esi
|
|
|
|
call GTAdelete
|
|
|
|
add esp, 4
|
|
|
|
|
|
|
|
LoadFLAC_Return_NoDelete:
|
|
|
|
mov eax, [esp+20h+4]
|
|
|
|
mov ecx, [esp+20h-0Ch]
|
|
|
|
pop ebx
|
|
|
|
pop esi
|
|
|
|
pop ebp
|
|
|
|
pop edi
|
|
|
|
mov fs:0, ecx
|
|
|
|
add esp, 10h
|
|
|
|
retn 4
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) FLACInit()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
mov byte ptr [ecx+0Dh], 1
|
|
|
|
jmp InitializeUtrax
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) FLACInit_Steam()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
mov byte ptr [ecx+5], 1
|
|
|
|
jmp InitializeUtrax
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Only 1.0/1.01
|
|
|
|
static void* HandleMoonStuffStub_JumpBack = AddressByVersion<void*>(0x713D24, 0x714554, 0x72F17F);
|
|
|
|
void __declspec(naked) HandleMoonStuffStub()
|
|
|
|
{
|
|
|
|
__asm
|
|
|
|
{
|
|
|
|
mov eax, [esp + 78h - 64h] // screen x size
|
|
|
|
mov ecx, [esp + 78h - 68h] // screen y size
|
|
|
|
|
|
|
|
push ecx
|
|
|
|
push eax
|
|
|
|
|
|
|
|
lea ecx, [esp + 80h - 54h] // screen coord vector
|
|
|
|
|
|
|
|
push ecx
|
|
|
|
|
|
|
|
push esi
|
|
|
|
|
|
|
|
call DrawMoonWithPhases
|
|
|
|
|
|
|
|
add esp, 10h
|
|
|
|
|
|
|
|
jmp HandleMoonStuffStub_JumpBack
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) HandleMoonStuffStub_Steam()
|
|
|
|
{
|
|
|
|
__asm
|
|
|
|
{
|
|
|
|
mov eax, [esp + 70h - 58h] // screen x size
|
|
|
|
mov ecx, [esp + 70h - 5Ch] // screen y size
|
|
|
|
|
|
|
|
push ecx
|
|
|
|
push eax
|
|
|
|
|
|
|
|
lea ecx, [esp + 78h - 48h] // screen coord vector
|
|
|
|
|
|
|
|
push ecx
|
|
|
|
|
|
|
|
push esi
|
|
|
|
|
|
|
|
call DrawMoonWithPhases
|
|
|
|
|
|
|
|
add esp, 10h
|
|
|
|
|
|
|
|
jmp HandleMoonStuffStub_JumpBack
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 1.0 ONLY BEGINS HERE
|
|
|
|
static bool bDarkVehicleThing;
|
|
|
|
static RpLight** pDirect;
|
|
|
|
|
|
|
|
static void* DarkVehiclesFix1_JumpBack;
|
|
|
|
void __declspec(naked) DarkVehiclesFix1()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
shr eax, 0Eh
|
|
|
|
test al, 1
|
|
|
|
jz DarkVehiclesFix1_DontAppply
|
|
|
|
mov ecx, [pDirect]
|
|
|
|
mov ecx, [ecx]
|
|
|
|
mov al, [ecx+2]
|
|
|
|
test al, 1
|
|
|
|
jnz DarkVehiclesFix1_DontAppply
|
|
|
|
mov bDarkVehicleThing, 1
|
|
|
|
jmp DarkVehiclesFix1_Return
|
|
|
|
|
|
|
|
DarkVehiclesFix1_DontAppply:
|
|
|
|
mov bDarkVehicleThing, 0
|
|
|
|
|
|
|
|
DarkVehiclesFix1_Return:
|
|
|
|
jmp DarkVehiclesFix1_JumpBack
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) DarkVehiclesFix2()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
jz DarkVehiclesFix2_MakeItDark
|
|
|
|
mov al, bDarkVehicleThing
|
|
|
|
test al, al
|
|
|
|
jnz DarkVehiclesFix2_MakeItDark
|
|
|
|
mov eax, 5D9A7Ah
|
|
|
|
jmp eax
|
|
|
|
|
|
|
|
DarkVehiclesFix2_MakeItDark:
|
|
|
|
mov eax, 5D9B09h
|
|
|
|
jmp eax
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) DarkVehiclesFix3()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
jz DarkVehiclesFix3_MakeItDark
|
|
|
|
mov al, bDarkVehicleThing
|
|
|
|
test al, al
|
|
|
|
jnz DarkVehiclesFix3_MakeItDark
|
|
|
|
mov eax, 5D9B4Ah
|
|
|
|
jmp eax
|
|
|
|
|
|
|
|
DarkVehiclesFix3_MakeItDark:
|
|
|
|
mov eax, 5D9CACh
|
|
|
|
jmp eax
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) DarkVehiclesFix4()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
jz DarkVehiclesFix4_MakeItDark
|
|
|
|
mov al, bDarkVehicleThing
|
|
|
|
test al, al
|
|
|
|
jnz DarkVehiclesFix4_MakeItDark
|
|
|
|
mov eax, 5D9CB8h
|
|
|
|
jmp eax
|
|
|
|
|
|
|
|
DarkVehiclesFix4_MakeItDark:
|
|
|
|
mov eax, 5D9E0Dh
|
|
|
|
jmp eax
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 1.0 ONLY ENDS HERE
|
|
|
|
|
2017-03-20 21:10:50 +01:00
|
|
|
static int _Timers_ftol_internal( double timer, double& remainder )
|
|
|
|
{
|
|
|
|
double integral;
|
|
|
|
remainder = modf( timer + remainder, &integral );
|
|
|
|
return int(integral);
|
|
|
|
}
|
|
|
|
|
|
|
|
int __stdcall Timers_ftol_PauseMode( double timer )
|
|
|
|
{
|
|
|
|
static double TimersRemainder = 0.0;
|
|
|
|
return _Timers_ftol_internal( timer, TimersRemainder );
|
|
|
|
}
|
|
|
|
|
|
|
|
int __stdcall Timers_ftol_NonClipped( double timer )
|
|
|
|
{
|
|
|
|
static double TimersRemainder = 0.0;
|
|
|
|
return _Timers_ftol_internal( timer, TimersRemainder );
|
|
|
|
}
|
|
|
|
|
|
|
|
int __stdcall Timers_ftol( double timer )
|
|
|
|
{
|
|
|
|
static double TimersRemainder = 0.0;
|
|
|
|
return _Timers_ftol_internal( timer, TimersRemainder );
|
|
|
|
}
|
|
|
|
|
2017-04-10 01:01:43 +02:00
|
|
|
int __stdcall Timers_ftol_SCMdelta( double timer )
|
|
|
|
{
|
|
|
|
static double TimersRemainder = 0.0;
|
|
|
|
return _Timers_ftol_internal( timer, TimersRemainder );
|
|
|
|
}
|
|
|
|
|
2017-03-20 21:10:50 +01:00
|
|
|
void __declspec(naked) asmTimers_ftol_PauseMode()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
sub esp, 8
|
|
|
|
fstp qword ptr [esp]
|
|
|
|
call Timers_ftol_PauseMode
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) asmTimers_ftol_NonClipped()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
sub esp, 8
|
|
|
|
fstp qword ptr [esp]
|
|
|
|
call Timers_ftol_NonClipped
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __declspec(naked) asmTimers_ftol()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
sub esp, 8
|
|
|
|
fstp qword ptr [esp]
|
|
|
|
call Timers_ftol
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-10 01:01:43 +02:00
|
|
|
void __declspec(naked) asmTimers_SCMdelta()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
sub esp, 8
|
|
|
|
fstp qword ptr [esp]
|
|
|
|
call Timers_ftol_SCMdelta
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
void _declspec(naked) FixedCarDamage()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
fldz
|
|
|
|
fcomp [esp+20h+10h]
|
|
|
|
fnstsw ax
|
|
|
|
test ah, 5
|
|
|
|
jp FixedCarDamage_Negative
|
|
|
|
movzx eax, byte ptr [edi+21h]
|
|
|
|
retn
|
|
|
|
|
|
|
|
FixedCarDamage_Negative:
|
|
|
|
movzx eax, byte ptr [edi+24h]
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void _declspec(naked) FixedCarDamage_Steam()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
fldz
|
|
|
|
fcomp [esp+20h+10h]
|
|
|
|
fnstsw ax
|
|
|
|
test ah, 5
|
|
|
|
jp FixedCarDamage_Negative
|
|
|
|
movzx eax, byte ptr [edi+21h]
|
|
|
|
test ecx, ecx
|
|
|
|
retn
|
|
|
|
|
|
|
|
FixedCarDamage_Negative:
|
|
|
|
movzx eax, byte ptr [edi+24h]
|
|
|
|
test ecx, ecx
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void _declspec(naked) FixedCarDamage_Newsteam()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
mov edi, [ebp+10h]
|
|
|
|
fldz
|
|
|
|
fcomp [ebp+14h]
|
|
|
|
fnstsw ax
|
|
|
|
test ah, 5
|
|
|
|
jp FixedCarDamage_Negative
|
|
|
|
movzx eax, byte ptr [edi+21h]
|
|
|
|
retn
|
|
|
|
|
|
|
|
FixedCarDamage_Negative:
|
|
|
|
movzx eax, byte ptr [edi+24h]
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-20 15:54:59 +01:00
|
|
|
void __declspec(naked) CdStreamThreadHighSize()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
xor edx, edx
|
|
|
|
shld edx, ecx, 11
|
|
|
|
shl ecx, 11
|
2017-09-20 02:08:29 +02:00
|
|
|
mov [esi]CdStream.overlapped.Offset, ecx // OVERLAPPED.Offset
|
|
|
|
mov [esi]CdStream.overlapped.OffsetHigh, edx // OVERLAPPED.OffsetHigh
|
2016-11-20 15:54:59 +01:00
|
|
|
|
2017-09-20 02:08:29 +02:00
|
|
|
mov edx, [esi]CdStream.nSectorsToRead
|
2016-11-20 15:54:59 +01:00
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-04 15:17:59 +01:00
|
|
|
void __declspec(naked) WeaponRangeMult_VehicleCheck()
|
|
|
|
{
|
|
|
|
_asm
|
|
|
|
{
|
|
|
|
mov eax, [edx]CPed.pedFlags
|
|
|
|
test ah, 1
|
|
|
|
jz WeaponRangeMult_VehicleCheck_NotInCar
|
|
|
|
mov eax, [edx]CPed.pVehicle
|
|
|
|
retn
|
|
|
|
|
|
|
|
WeaponRangeMult_VehicleCheck_NotInCar:
|
|
|
|
xor eax, eax
|
|
|
|
retn
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
static const float fSteamSubtitleSizeX = 0.45f;
|
|
|
|
static const float fSteamSubtitleSizeY = 0.9f;
|
|
|
|
static const float fSteamRadioNamePosY = 33.0f;
|
|
|
|
static const float fSteamRadioNameSizeX = 0.4f;
|
|
|
|
static const float fSteamRadioNameSizeY = 0.6f;
|
|
|
|
|
|
|
|
static const double dRetailSubtitleSizeX = 0.58;
|
|
|
|
static const double dRetailSubtitleSizeY = 1.2;
|
|
|
|
static const double dRetailSubtitleSizeY2 = 1.22;
|
|
|
|
static const double dRetailRadioNamePosY = 22.0;
|
|
|
|
static const double dRetailRadioNameSizeX = 0.6;
|
|
|
|
static const double dRetailRadioNameSizeY = 0.9;
|
|
|
|
|
2017-10-03 23:32:14 +02:00
|
|
|
#pragma comment(lib, "shlwapi.lib")
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
BOOL InjectDelayedPatches_10()
|
|
|
|
{
|
|
|
|
if ( !IsAlreadyRunning() )
|
|
|
|
{
|
2016-08-10 22:27:58 +02:00
|
|
|
using namespace Memory;
|
2017-09-18 12:52:35 +02:00
|
|
|
|
|
|
|
const HINSTANCE hInstance = GetModuleHandle( nullptr );
|
|
|
|
std::unique_ptr<ScopedUnprotect::Unprotect> Protect = ScopedUnprotect::UnprotectSectionOrFullModule( hInstance, ".text" );
|
|
|
|
ScopedUnprotect::Section Protect2( hInstance, ".rdata" );
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Obtain a path to the ASI
|
|
|
|
wchar_t wcModulePath[MAX_PATH];
|
2017-03-18 01:43:51 +01:00
|
|
|
GetModuleFileNameW(hDLLModule, wcModulePath, _countof(wcModulePath) - 3); // Minus max required space for extension
|
|
|
|
PathRenameExtensionW(wcModulePath, L".ini");
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-10-04 19:12:33 +02:00
|
|
|
ModuleList moduleList;
|
2017-10-03 21:03:23 +02:00
|
|
|
moduleList.Enumerate();
|
|
|
|
|
|
|
|
const bool bHasImVehFt = moduleList.Get(L"ImVehFt") != nullptr;
|
|
|
|
const bool bSAMP = moduleList.Get(L"samp") != nullptr;
|
|
|
|
const bool bSARender = moduleList.Get(L"SARender") != nullptr;
|
2018-04-08 14:40:30 +02:00
|
|
|
const bool bOutfit = moduleList.Get(L"outfit") != nullptr;
|
2017-09-21 17:43:32 +02:00
|
|
|
|
2017-10-03 21:03:23 +02:00
|
|
|
const HMODULE skygfxModule = moduleList.Get( L"skygfx" );
|
|
|
|
const HMODULE modloaderModule = moduleList.Get( L"modloader" );
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2015-05-05 23:29:15 +02:00
|
|
|
ReadRotorFixExceptions(wcModulePath);
|
2017-09-21 17:43:32 +02:00
|
|
|
const bool bHookDoubleRwheels = ReadDoubleRearWheels(wcModulePath);
|
2015-05-05 23:29:15 +02:00
|
|
|
|
2017-09-19 21:40:48 +02:00
|
|
|
const bool bHasDebugMenu = DebugMenuLoad();
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"SunSizeHack", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2016-07-26 18:26:14 +02:00
|
|
|
// PS2 sun - more
|
|
|
|
static const float fSunMult = (1050.0f * 0.95f) / 1500.0f;
|
|
|
|
Patch<const void*>(0x6FC5B0, &fSunMult);
|
|
|
|
|
|
|
|
if ( !bSAMP )
|
|
|
|
{
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x53C136, DoSunAndMoon );
|
2016-07-26 18:26:14 +02:00
|
|
|
InjectHook(0x53C136, SunAndMoonFarClip);
|
|
|
|
Patch<const void*>(0x6FC5AA, &fSunFarClip);
|
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( !bSARender )
|
|
|
|
{
|
|
|
|
// Twopass rendering (experimental)
|
2017-09-28 21:43:16 +02:00
|
|
|
Patch<const void*>(0x7341D9, MovingPropellerRender);
|
|
|
|
Patch<const void*>(0x734127, MovingPropellerRender);
|
|
|
|
Patch(0x73445E, RenderBigVehicleActomic);
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Weapons rendering
|
2018-04-08 14:40:30 +02:00
|
|
|
if ( !bOutfit )
|
|
|
|
{
|
|
|
|
InjectHook(0x5E7859, RenderWeapon);
|
|
|
|
InjectHook(0x732F30, RenderWeaponPedsForPC, PATCH_JUMP);
|
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"EnableScriptFixes", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
// Gym glitch fix
|
|
|
|
Patch<WORD>(0x470B03, 0xCD8B);
|
|
|
|
Patch<DWORD>(0x470B0A, 0x8B04508B);
|
|
|
|
Patch<WORD>(0x470B0E, 0x9000);
|
|
|
|
Nop(0x470B10, 1);
|
|
|
|
InjectHook(0x470B05, &CRunningScript::GetDay_GymGlitch, PATCH_CALL);
|
|
|
|
|
|
|
|
// Basketball fix
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x489A70, WipeLocalVariableMemoryForMissionScript );
|
|
|
|
ReadCall( 0x5D18F0, TheScriptsLoad );
|
2015-04-22 15:20:40 +02:00
|
|
|
InjectHook(0x5D18F0, TheScriptsLoad_BasketballFix);
|
|
|
|
// Fixed for Hoodlum
|
2016-03-13 13:33:52 +01:00
|
|
|
InjectHook(0x489A70, StartNewMission_SCMFixes);
|
|
|
|
InjectHook(0x4899F0, StartNewMission_SCMFixes);
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"SkipIntroSplashes", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
// Skip the damn intro splash
|
|
|
|
Patch<WORD>(AddressByRegion_10<DWORD>(0x748AA8), 0x3DEB);
|
|
|
|
}
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"SmallSteamTexts", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
// We're on 1.0 - make texts smaller
|
|
|
|
Patch<const void*>(0x58C387, &fSteamSubtitleSizeY);
|
|
|
|
Patch<const void*>(0x58C40F, &fSteamSubtitleSizeY);
|
|
|
|
Patch<const void*>(0x58C4CE, &fSteamSubtitleSizeY);
|
|
|
|
|
|
|
|
Patch<const void*>(0x58C39D, &fSteamSubtitleSizeX);
|
|
|
|
Patch<const void*>(0x58C425, &fSteamSubtitleSizeX);
|
|
|
|
Patch<const void*>(0x58C4E4, &fSteamSubtitleSizeX);
|
|
|
|
|
|
|
|
Patch<const void*>(0x4E9FD8, &fSteamRadioNamePosY);
|
|
|
|
Patch<const void*>(0x4E9F22, &fSteamRadioNameSizeY);
|
|
|
|
Patch<const void*>(0x4E9F38, &fSteamRadioNameSizeX);
|
|
|
|
}
|
|
|
|
|
2017-11-30 18:19:43 +01:00
|
|
|
if ( const int INIoption = GetPrivateProfileIntW(L"SilentPatch", L"ColouredZoneNames", -1, wcModulePath); INIoption != -1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2017-11-15 00:20:17 +01:00
|
|
|
// Coloured zone names
|
|
|
|
bColouredZoneNames = INIoption != 0;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-11-15 00:20:17 +01:00
|
|
|
Patch<WORD>(0x58ADBE, 0x0E75);
|
|
|
|
Patch<WORD>(0x58ADC5, 0x0775);
|
|
|
|
|
|
|
|
InjectHook(0x58ADE4, &CRGBA::BlendGangColour_Dynamic);
|
|
|
|
|
|
|
|
if ( bHasDebugMenu )
|
2017-09-12 16:08:22 +02:00
|
|
|
{
|
2017-11-15 00:20:17 +01:00
|
|
|
DebugMenuAddVar( "SilentPatch", "Coloured zone names", &bColouredZoneNames, nullptr );
|
2017-09-12 16:08:22 +02:00
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// ImVehFt conflicts
|
|
|
|
if ( !bHasImVehFt )
|
|
|
|
{
|
|
|
|
// Lights
|
|
|
|
InjectHook(0x4C830C, LightMaterialsFix, PATCH_CALL);
|
|
|
|
|
|
|
|
// Flying components
|
|
|
|
InjectHook(0x59F180, &CObject::Render_Stub, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Cars getting dirty
|
|
|
|
// Only 1.0 and Steam
|
2017-04-10 13:02:50 +02:00
|
|
|
InjectHook( 0x5D5DB0, RemapDirt, PATCH_JUMP );
|
2015-04-22 15:20:40 +02:00
|
|
|
InjectHook(0x4C9648, &CVehicleModelInfo::FindEditableMaterialList, PATCH_CALL);
|
|
|
|
Patch<DWORD>(0x4C964D, 0x0FEBCE8B);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !bHasImVehFt && !bSAMP )
|
|
|
|
{
|
|
|
|
// Properly random numberplates
|
|
|
|
DWORD* pVMT = *(DWORD**)0x4C75FC;
|
|
|
|
Patch(&pVMT[7], &CVehicleModelInfo::Shutdown_Stub);
|
|
|
|
Patch<BYTE>(0x6D0E43, 0xEB);
|
|
|
|
InjectHook(0x4C9660, &CVehicleModelInfo::SetCarCustomPlate);
|
|
|
|
InjectHook(0x6D6A58, &CVehicle::CustomCarPlate_TextureCreate);
|
|
|
|
InjectHook(0x6D651C, &CVehicle::CustomCarPlate_BeforeRenderingStart);
|
|
|
|
InjectHook(0x6FDFE0, CCustomCarPlateMgr::SetupClumpAfterVehicleUpgrade, PATCH_JUMP);
|
|
|
|
//InjectMethodVP(0x6D0E53, CVehicle::CustomCarPlate_AfterRenderingStop, PATCH_NOTHING);
|
|
|
|
Nop(0x6D6517, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
// SSE conflicts
|
2017-10-03 21:03:23 +02:00
|
|
|
if ( moduleList.Get(L"shadows") == nullptr )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
Patch<DWORD>(0x70665C, 0x52909090);
|
|
|
|
InjectHook(0x706662, &CShadowCamera::Update);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Bigger streamed entity linked lists
|
|
|
|
// Increase only if they're not increased already
|
|
|
|
if ( *(DWORD*)0x5B8E55 == 12000 )
|
|
|
|
{
|
|
|
|
Patch<DWORD>(0x5B8E55, 15000);
|
|
|
|
Patch<DWORD>(0x5B8EB0, 15000);
|
|
|
|
}
|
|
|
|
|
2017-04-27 16:17:38 +02:00
|
|
|
// Read CCustomCarPlateMgr::GeneratePlateText from here
|
|
|
|
// to work fine with Deji's Custom Plate Format
|
|
|
|
ReadCall( 0x4C9484, CCustomCarPlateMgr::GeneratePlateText );
|
|
|
|
|
2017-09-12 16:14:07 +02:00
|
|
|
|
|
|
|
if ( bHookDoubleRwheels )
|
|
|
|
{
|
|
|
|
// Double rwheels whitelist
|
|
|
|
// push ecx
|
|
|
|
// push edi
|
|
|
|
// call CheckDoubleRWheelsWhitelist
|
|
|
|
// test al, al
|
|
|
|
Patch<uint16_t>( 0x4C9239, 0x5751 );
|
|
|
|
InjectHook( 0x4C9239+2, CheckDoubleRWheelsList, PATCH_CALL );
|
|
|
|
Patch<uint16_t>( 0x4C9239+7, 0xC084 );
|
|
|
|
Nop( 0x4C9239+9, 1 );
|
|
|
|
}
|
|
|
|
|
2016-04-22 20:54:32 +02:00
|
|
|
// Adblocker
|
|
|
|
#if DISABLE_FLA_DONATION_WINDOW
|
2017-10-03 21:03:23 +02:00
|
|
|
if ( moduleList.Get(L"$fastman92limitAdjuster") != nullptr )
|
2016-04-22 20:54:32 +02:00
|
|
|
{
|
|
|
|
if ( *(DWORD*)0x748736 != 0xE8186A53 )
|
|
|
|
{
|
|
|
|
Patch<DWORD>(0x748736, 0xE8186A53);
|
|
|
|
InjectHook(AddressByRegion_10<int>(0x748739), 0x619B60);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2017-06-20 20:32:25 +02:00
|
|
|
if ( *(DWORD*)0x4065BB == 0x3B0BE1C1 )
|
|
|
|
{
|
|
|
|
// Handle IMGs bigger than 4GB
|
|
|
|
Nop( 0x4065BB, 3 );
|
|
|
|
Nop( 0x4065C2, 1 );
|
|
|
|
InjectHook( 0x4065C2+1, CdStreamThreadHighSize, PATCH_CALL );
|
|
|
|
Patch<const void*>( 0x406620+2, &pCdStreamSetFilePointer );
|
|
|
|
}
|
|
|
|
|
2017-09-19 17:46:42 +02:00
|
|
|
|
|
|
|
// Fix directional light position
|
2017-11-30 18:19:43 +01:00
|
|
|
if ( const int INIoption = GetPrivateProfileIntW(L"SilentPatch", L"DirectionalFromSun", -1, wcModulePath); INIoption != -1 )
|
2017-09-19 21:40:48 +02:00
|
|
|
{
|
2017-11-15 00:06:36 +01:00
|
|
|
bUseAaronSun = INIoption != 0;
|
|
|
|
|
|
|
|
ReadCall( 0x53E997, orgSetLightsWithTimeOfDayColour );
|
|
|
|
InjectHook( 0x53E997, SetLightsWithTimeOfDayColour_SilentPatch );
|
|
|
|
Patch<const void*>( 0x735618 + 2, &curVecToSun.x );
|
|
|
|
Patch<const void*>( 0x73561E + 2, &curVecToSun.y );
|
|
|
|
Patch<const void*>( 0x735624 + 1, &curVecToSun.z );
|
|
|
|
|
|
|
|
if ( bHasDebugMenu )
|
|
|
|
{
|
|
|
|
DebugMenuAddVar( "SilentPatch", "Directional from sun", &bUseAaronSun, nullptr );
|
|
|
|
|
|
|
|
#ifndef NDEBUG
|
|
|
|
// Switch for fixed PC vehicle lighting
|
|
|
|
static bool bFixedPCVehLight = true;
|
|
|
|
DebugMenuAddVar( "SilentPatch", "Fixed PC vehicle light", &bFixedPCVehLight, []() {
|
|
|
|
if ( bFixedPCVehLight )
|
|
|
|
{
|
|
|
|
Memory::VP::Patch<float>(0x5D88D1 + 6, 0);
|
|
|
|
Memory::VP::Patch<float>(0x5D88DB + 6, 0);
|
|
|
|
Memory::VP::Patch<float>(0x5D88E5 + 6, 0);
|
|
|
|
|
|
|
|
Memory::VP::Patch<float>(0x5D88F9 + 6, 0);
|
|
|
|
Memory::VP::Patch<float>(0x5D8903 + 6, 0);
|
|
|
|
Memory::VP::Patch<float>(0x5D890D + 6, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Memory::VP::Patch<float>(0x5D88D1 + 6, 0.25f);
|
|
|
|
Memory::VP::Patch<float>(0x5D88DB + 6, 0.25f);
|
|
|
|
Memory::VP::Patch<float>(0x5D88E5 + 6, 0.25f);
|
|
|
|
|
|
|
|
Memory::VP::Patch<float>(0x5D88F9 + 6, 0.75f);
|
|
|
|
Memory::VP::Patch<float>(0x5D8903 + 6, 0.75f);
|
|
|
|
Memory::VP::Patch<float>(0x5D890D + 6, 0.75f);
|
|
|
|
}
|
|
|
|
} );
|
|
|
|
#endif
|
|
|
|
}
|
2017-09-19 21:40:48 +02:00
|
|
|
}
|
|
|
|
|
2017-12-22 00:13:28 +01:00
|
|
|
// Minimal HUD
|
|
|
|
if ( const int INIoption = GetPrivateProfileIntW(L"SilentPatch", L"MinimalHud", -1, wcModulePath); INIoption != -1 )
|
|
|
|
{
|
|
|
|
// Fix original bugs
|
|
|
|
Patch( 0x58950E, { 0x90, 0xFF, 0x74, 0x24, 0x1C } );
|
|
|
|
InjectHook( 0x58951D, &SetRGBA_FloatAlpha );
|
|
|
|
|
|
|
|
Patch( 0x58D88A, { 0x90, 0xFF, 0x74, 0x24, 0x20 + 0x10 } );
|
|
|
|
InjectHook( 0x58D8FD, &RenderXLUSprite_FloatAlpha );
|
|
|
|
|
|
|
|
// Re-enable
|
|
|
|
if ( INIoption == 1 )
|
|
|
|
{
|
|
|
|
Patch<int32_t>( 0x588905 + 1, 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2017-09-21 17:43:32 +02:00
|
|
|
// Moonphases
|
|
|
|
// Not taking effect with new skygfx since aap has it too now
|
|
|
|
if ( !ModCompat::SkygfxPatchesMoonphases( skygfxModule ) )
|
|
|
|
{
|
|
|
|
InjectHook(0x713ACB, HandleMoonStuffStub, PATCH_JUMP);
|
|
|
|
}
|
2017-09-23 13:21:10 +02:00
|
|
|
|
2017-10-04 19:12:33 +02:00
|
|
|
FLAUtils::Init( moduleList );
|
2017-09-26 16:36:49 +02:00
|
|
|
|
2017-09-23 13:21:10 +02:00
|
|
|
// Race condition in CdStream fixed
|
|
|
|
// Not taking effect with modloader
|
2017-09-26 18:03:13 +02:00
|
|
|
if ( !ModCompat::ModloaderCdStreamRaceConditionAware( modloaderModule ) )
|
2017-09-23 13:21:10 +02:00
|
|
|
{
|
2017-09-26 18:03:13 +02:00
|
|
|
// Don't patch if old FLA and enhanced IMGs are in place
|
|
|
|
// For new FLA, we patch everything except CdStreamThread and then interop with FLA
|
|
|
|
const bool flaBugAware = FLAUtils::CdStreamRaceConditionAware();
|
|
|
|
const bool usesEnhancedImages = FLAUtils::UsesEnhancedIMGs();
|
2017-09-23 13:21:10 +02:00
|
|
|
|
2017-09-26 18:03:13 +02:00
|
|
|
if ( !usesEnhancedImages || flaBugAware )
|
2017-09-23 13:21:10 +02:00
|
|
|
{
|
2017-09-26 18:03:13 +02:00
|
|
|
ReadCall( 0x406C78, CdStreamSync::orgCdStreamInitThread );
|
|
|
|
InjectHook( 0x406C78, CdStreamSync::CdStreamInitThread );
|
2017-09-23 13:21:10 +02:00
|
|
|
|
|
|
|
{
|
2017-09-26 18:03:13 +02:00
|
|
|
uintptr_t address;
|
|
|
|
if ( *(uint8_t*)0x406460 == 0xE9 )
|
|
|
|
{
|
|
|
|
ReadCall( 0x406460, address );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
address = 0x406460;
|
|
|
|
}
|
2017-09-23 13:21:10 +02:00
|
|
|
|
2017-09-26 18:03:13 +02:00
|
|
|
const uintptr_t waitForSingleObject = address + 0x1D;
|
|
|
|
const uint8_t orgCode[] = { 0x8B, 0x46, 0x04, 0x85, 0xC0, 0x74, 0x10, 0xC6, 0x46, 0x0D, 0x01 };
|
|
|
|
if ( memcmp( orgCode, (void*)waitForSingleObject, sizeof(orgCode) ) == 0 )
|
2017-09-23 13:21:10 +02:00
|
|
|
{
|
2017-09-26 18:03:13 +02:00
|
|
|
VP::Patch( waitForSingleObject, { 0x56, 0xFF, 0x15 } );
|
|
|
|
VP::Patch( waitForSingleObject + 3, &CdStreamSync::CdStreamSyncOnObject );
|
|
|
|
VP::Patch( waitForSingleObject + 3 + 4, { 0x5E, 0xC3 } );
|
|
|
|
|
2017-09-23 13:21:10 +02:00
|
|
|
{
|
2017-09-26 18:03:13 +02:00
|
|
|
const uint8_t orgCode1[] = { 0xFF, 0x15 };
|
|
|
|
const uint8_t orgCode2[] = { 0x48, 0xF7, 0xD8 };
|
|
|
|
const uintptr_t getOverlappedResult = address + 0x5F;
|
|
|
|
if ( memcmp( orgCode1, (void*)getOverlappedResult, sizeof(orgCode1) ) == 0 &&
|
|
|
|
memcmp( orgCode2, (void*)(getOverlappedResult + 6), sizeof(orgCode2) ) == 0 )
|
|
|
|
{
|
|
|
|
VP::Patch( getOverlappedResult + 2, &CdStreamSync::pGetOverlappedResult );
|
|
|
|
VP::Patch( getOverlappedResult + 6, { 0x5E, 0xC3 } ); // pop esi / retn
|
|
|
|
}
|
2017-09-23 13:21:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-26 18:03:13 +02:00
|
|
|
if ( !usesEnhancedImages )
|
|
|
|
{
|
|
|
|
Patch( 0x406669, { 0x56, 0xFF, 0x15 } );
|
|
|
|
Patch( 0x406669 + 3, &CdStreamSync::CdStreamThreadOnObject );
|
|
|
|
Patch( 0x406669 + 3 + 4, { 0xEB, 0x0F } );
|
|
|
|
}
|
2017-09-23 13:21:10 +02:00
|
|
|
|
2017-09-26 18:03:13 +02:00
|
|
|
Patch( 0x406910, { 0xFF, 0x15 } );
|
|
|
|
Patch( 0x406910 + 2, &CdStreamSync::CdStreamInitializeSyncObject );
|
|
|
|
Nop( 0x406910 + 6, 4 );
|
|
|
|
Nop( 0x406910 + 0x16, 2 );
|
2017-09-23 13:21:10 +02:00
|
|
|
|
2017-09-26 18:03:13 +02:00
|
|
|
Patch( 0x4063B5, { 0x56, 0x50 } );
|
|
|
|
InjectHook( 0x4063B5 + 2, CdStreamSync::CdStreamShutdownSyncObject_Stub, PATCH_CALL );
|
|
|
|
}
|
2017-09-23 13:21:10 +02:00
|
|
|
}
|
2017-09-23 19:34:28 +02:00
|
|
|
|
2017-12-22 01:07:51 +01:00
|
|
|
// For imfast compatibility
|
|
|
|
if ( MemEquals( 0x590ADE, { 0xFF, 0x05 } ) )
|
|
|
|
{
|
|
|
|
// Modulo over CLoadingScreen::m_currDisplayedSplash
|
|
|
|
Nop( 0x590ADE, 1 );
|
|
|
|
InjectHook( 0x590ADE + 1, DoPCScreenChange_Mod, PATCH_CALL );
|
|
|
|
Patch<const void*>( 0x590042 + 2, &currDisplayedSplash_ForLastSplash );
|
|
|
|
}
|
|
|
|
|
2017-09-23 19:34:28 +02:00
|
|
|
#ifndef NDEBUG
|
2017-11-30 18:19:43 +01:00
|
|
|
if ( const int QPCDays = GetPrivateProfileIntW(L"Debug", L"AddDaysToQPC", 0, wcModulePath); QPCDays != 0 )
|
2017-09-23 19:34:28 +02:00
|
|
|
{
|
2017-11-30 18:19:43 +01:00
|
|
|
using namespace FakeQPC;
|
2017-09-23 19:34:28 +02:00
|
|
|
|
2017-11-30 18:19:43 +01:00
|
|
|
LARGE_INTEGER Freq;
|
|
|
|
QueryPerformanceFrequency( &Freq );
|
|
|
|
AddedTime = Freq.QuadPart * QPCDays * 60 * 24;
|
2017-09-23 19:34:28 +02:00
|
|
|
|
2017-11-30 18:19:43 +01:00
|
|
|
Patch( 0x8580C8, &FakeQueryPerformanceCounter );
|
2017-09-23 19:34:28 +02:00
|
|
|
}
|
|
|
|
#endif
|
2017-06-20 20:32:25 +02:00
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOL InjectDelayedPatches_11()
|
|
|
|
{
|
2017-09-28 23:48:08 +02:00
|
|
|
#ifdef NDEBUG
|
2018-02-11 13:58:10 +01:00
|
|
|
MessageBoxW( nullptr, L"You're using a 1.01 executable which is no longer supported by SilentPatch!\n\n"
|
|
|
|
L"Since this EXE is used by only a few people, I recommend downgrading back to 1.0 - you gain full compatibility with mods "
|
|
|
|
L"and any relevant fixes 1.01 brings are backported to 1.0 by SilentPatch anyway.\n\n"
|
|
|
|
L"To downgrade to 1.0, just find a 1.0 EXE and use it. If you are having issues with this, feel free to send me an e-mail!",
|
|
|
|
L"SilentPatch", MB_OK | MB_ICONWARNING );
|
2017-09-28 23:48:08 +02:00
|
|
|
#endif
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
if ( !IsAlreadyRunning() )
|
|
|
|
{
|
2016-08-10 22:27:58 +02:00
|
|
|
using namespace Memory;
|
2017-09-18 12:52:35 +02:00
|
|
|
const HINSTANCE hInstance = GetModuleHandle( nullptr );
|
|
|
|
std::unique_ptr<ScopedUnprotect::Unprotect> Protect = ScopedUnprotect::UnprotectSectionOrFullModule( hInstance, ".text" );
|
|
|
|
ScopedUnprotect::Section Protect2( hInstance, ".rdata" );
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Obtain a path to the ASI
|
|
|
|
wchar_t wcModulePath[MAX_PATH];
|
2017-03-18 01:43:51 +01:00
|
|
|
GetModuleFileNameW(hDLLModule, wcModulePath, _countof(wcModulePath) - 3); // Minus max required space for extension
|
|
|
|
PathRenameExtensionW(wcModulePath, L".ini");
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-10-04 19:12:33 +02:00
|
|
|
ModuleList moduleList;
|
2017-10-03 21:03:23 +02:00
|
|
|
moduleList.Enumerate();
|
|
|
|
|
|
|
|
bool bHasImVehFt = moduleList.Get(L"ImVehFt") != nullptr;
|
|
|
|
bool bSAMP = moduleList.Get(L"samp") != nullptr;
|
|
|
|
bool bSARender = moduleList.Get(L"SARender") != nullptr;
|
2018-04-08 14:40:30 +02:00
|
|
|
const bool bOutfit = moduleList.Get(L"outfit") != nullptr;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2015-05-05 23:29:15 +02:00
|
|
|
ReadRotorFixExceptions(wcModulePath);
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"SunSizeHack", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2016-07-26 18:26:14 +02:00
|
|
|
// PS2 sun - more
|
|
|
|
static const float fSunMult = (1050.0f * 0.95f) / 1500.0f;
|
|
|
|
Patch<const void*>(0x6FCDE0, &fSunMult);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2016-07-26 18:26:14 +02:00
|
|
|
if ( !bSAMP )
|
|
|
|
{
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x53C5D6, DoSunAndMoon );
|
2016-07-26 18:26:14 +02:00
|
|
|
InjectHook(0x53C5D6, SunAndMoonFarClip);
|
|
|
|
|
|
|
|
Patch<const void*>(0x6FCDDA, &fSunFarClip);
|
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( !bSARender )
|
|
|
|
{
|
|
|
|
// Twopass rendering (experimental)
|
2017-09-28 21:43:16 +02:00
|
|
|
Patch<const void*>(0x734A09, MovingPropellerRender);
|
|
|
|
Patch<const void*>(0x734957, MovingPropellerRender);
|
|
|
|
Patch(0x734C8E, RenderBigVehicleActomic);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Weapons rendering
|
2018-04-08 14:40:30 +02:00
|
|
|
if ( !bOutfit )
|
|
|
|
{
|
|
|
|
InjectHook(0x5E8079, RenderWeapon);
|
|
|
|
InjectHook(0x733760, RenderWeaponPedsForPC, PATCH_JUMP);
|
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"EnableScriptFixes", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
// Gym glitch fix
|
|
|
|
Patch<WORD>(0x470B83, 0xCD8B);
|
|
|
|
Patch<DWORD>(0x470B8A, 0x8B04508B);
|
|
|
|
Patch<WORD>(0x470B8E, 0x9000);
|
|
|
|
Nop(0x470B90, 1);
|
|
|
|
InjectHook(0x470B85, &CRunningScript::GetDay_GymGlitch, PATCH_CALL);
|
|
|
|
|
|
|
|
// Basketball fix
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x489AF0, WipeLocalVariableMemoryForMissionScript );
|
|
|
|
ReadCall( 0x5D20D0, TheScriptsLoad );
|
2015-04-22 15:20:40 +02:00
|
|
|
InjectHook(0x5D20D0, TheScriptsLoad_BasketballFix);
|
|
|
|
// Fixed for Hoodlum
|
2016-03-13 13:33:52 +01:00
|
|
|
InjectHook(0x489A70, StartNewMission_SCMFixes);
|
|
|
|
InjectHook(0x489AF0, StartNewMission_SCMFixes);
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"SkipIntroSplashes", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
// Skip the damn intro splash
|
|
|
|
Patch<WORD>(AddressByRegion_11<DWORD>(0x749388), 0x62EB);
|
|
|
|
}
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"SmallSteamTexts", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
// We're on 1.01 - make texts smaller
|
|
|
|
Patch<const void*>(0x58CB57, &fSteamSubtitleSizeY);
|
|
|
|
Patch<const void*>(0x58CBDF, &fSteamSubtitleSizeY);
|
|
|
|
Patch<const void*>(0x58CC9E, &fSteamSubtitleSizeY);
|
|
|
|
|
|
|
|
Patch<const void*>(0x58CB6D, &fSteamSubtitleSizeX);
|
|
|
|
Patch<const void*>(0x58CBF5, &fSteamSubtitleSizeX);
|
|
|
|
Patch<const void*>(0x58CCB4, &fSteamSubtitleSizeX);
|
|
|
|
|
|
|
|
Patch<const void*>(0x4EA428, &fSteamRadioNamePosY);
|
|
|
|
Patch<const void*>(0x4EA372, &fSteamRadioNameSizeY);
|
|
|
|
Patch<const void*>(0x4EA388, &fSteamRadioNameSizeX);
|
|
|
|
}
|
|
|
|
|
2017-11-15 00:20:17 +01:00
|
|
|
if ( int INIoption = GetPrivateProfileIntW(L"SilentPatch", L"ColouredZoneNames", -1, wcModulePath); INIoption == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2017-11-15 00:20:17 +01:00
|
|
|
// Coloured zone names
|
|
|
|
Patch<WORD>(0x58B58E, 0x0E75);
|
|
|
|
Patch<WORD>(0x58B595, 0x0775);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-11-15 00:20:17 +01:00
|
|
|
InjectHook(0x58B5B4, &CRGBA::BlendGangColour);
|
|
|
|
}
|
|
|
|
else if ( INIoption == 0 )
|
|
|
|
{
|
|
|
|
Patch<BYTE>(0x58B57E, 0xEB);
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// ImVehFt conflicts
|
|
|
|
if ( !bHasImVehFt )
|
|
|
|
{
|
|
|
|
// Lights
|
|
|
|
InjectHook(0x4C838C, LightMaterialsFix, PATCH_CALL);
|
|
|
|
|
|
|
|
// Flying components
|
|
|
|
InjectHook(0x59F950, &CObject::Render_Stub, PATCH_JUMP);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !bHasImVehFt && !bSAMP )
|
|
|
|
{
|
|
|
|
// Properly random numberplates
|
|
|
|
DWORD* pVMT = *(DWORD**)0x4C767C;
|
|
|
|
Patch(&pVMT[7], &CVehicleModelInfo::Shutdown_Stub);
|
|
|
|
Patch<BYTE>(0x6D1663, 0xEB);
|
|
|
|
InjectHook(0x4C984D, &CVehicleModelInfo::SetCarCustomPlate);
|
|
|
|
InjectHook(0x6D7288, &CVehicle::CustomCarPlate_TextureCreate);
|
|
|
|
InjectHook(0x6D6D4C, &CVehicle::CustomCarPlate_BeforeRenderingStart);
|
|
|
|
InjectHook(0x6FE810, CCustomCarPlateMgr::SetupClumpAfterVehicleUpgrade, PATCH_JUMP);
|
|
|
|
Nop(0x6D6D47, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
// SSE conflicts
|
2017-10-03 21:03:23 +02:00
|
|
|
if ( moduleList.Get(L"shadows") == nullptr )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
Patch<DWORD>(0x706E8C, 0x52909090);
|
|
|
|
InjectHook(0x706E92, &CShadowCamera::Update);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Bigger streamed entity linked lists
|
|
|
|
// Increase only if they're not increased already
|
|
|
|
if ( *(DWORD*)0x5B9635 == 12000 )
|
|
|
|
{
|
|
|
|
Patch<DWORD>(0x5B9635, 15000);
|
|
|
|
Patch<DWORD>(0x5B9690, 15000);
|
|
|
|
}
|
|
|
|
|
2017-04-27 16:17:38 +02:00
|
|
|
// Read CCustomCarPlateMgr::GeneratePlateText from here
|
|
|
|
// to work fine with Deji's Custom Plate Format
|
|
|
|
// Albeit 1.01 obfuscates this function
|
|
|
|
CCustomCarPlateMgr::GeneratePlateText = (decltype(CCustomCarPlateMgr::GeneratePlateText))0x6FDDE0;
|
2017-06-20 20:32:25 +02:00
|
|
|
|
2017-10-04 19:12:33 +02:00
|
|
|
FLAUtils::Init( moduleList );
|
2017-04-27 16:17:38 +02:00
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOL InjectDelayedPatches_Steam()
|
|
|
|
{
|
2017-09-28 23:48:08 +02:00
|
|
|
#ifdef NDEBUG
|
|
|
|
{
|
|
|
|
const int messageResult = MessageBoxW( nullptr, L"You're using a 3.0 executable which is no longer supported by SilentPatch!\n\n"
|
|
|
|
L"Since this is an old Steam EXE, by now you should have either downgraded to 1.0 or started using an up to date version. It is recommended to "
|
|
|
|
L"verify your game's cache on Steam and then downgrade it to 1.0. Do you want to download San Andreas Downgrader now?\n\n"
|
|
|
|
L"Pressing Yes will close the game and open your web browser. Press No to proceed to the game anyway.", L"SilentPatch", MB_YESNO | MB_ICONWARNING );
|
|
|
|
if ( messageResult == IDYES )
|
|
|
|
{
|
|
|
|
ShellExecuteW( nullptr, L"open", L"http://gtaforums.com/topic/753764-/", nullptr, nullptr, SW_SHOWNORMAL );
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
if ( !IsAlreadyRunning() )
|
|
|
|
{
|
2016-08-10 22:27:58 +02:00
|
|
|
using namespace Memory;
|
2017-09-18 12:52:35 +02:00
|
|
|
const HINSTANCE hInstance = GetModuleHandle( nullptr );
|
|
|
|
std::unique_ptr<ScopedUnprotect::Unprotect> Protect = ScopedUnprotect::UnprotectSectionOrFullModule( hInstance, ".text" );
|
|
|
|
ScopedUnprotect::Section Protect2( hInstance, ".rdata" );
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Obtain a path to the ASI
|
|
|
|
wchar_t wcModulePath[MAX_PATH];
|
2017-03-18 01:43:51 +01:00
|
|
|
GetModuleFileNameW(hDLLModule, wcModulePath, _countof(wcModulePath) - 3); // Minus max required space for extension
|
|
|
|
PathRenameExtensionW(wcModulePath, L".ini");
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-10-04 19:12:33 +02:00
|
|
|
ModuleList moduleList;
|
2017-10-03 21:03:23 +02:00
|
|
|
moduleList.Enumerate();
|
|
|
|
|
|
|
|
bool bHasImVehFt = moduleList.Get(L"ImVehFt") != nullptr;
|
|
|
|
bool bSAMP = moduleList.Get(L"samp") != nullptr;
|
|
|
|
bool bSARender = moduleList.Get(L"SARender") != nullptr;
|
2018-04-08 14:40:30 +02:00
|
|
|
const bool bOutfit = moduleList.Get(L"outfit") != nullptr;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2015-05-05 23:29:15 +02:00
|
|
|
ReadRotorFixExceptions(wcModulePath);
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"SunSizeHack", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2016-07-26 18:26:14 +02:00
|
|
|
// PS2 sun - more
|
|
|
|
static const double dSunMult = (1050.0 * 0.95) / 1500.0;
|
|
|
|
Patch<const void*>(0x734DF0, &dSunMult);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2016-07-26 18:26:14 +02:00
|
|
|
if ( !bSAMP )
|
|
|
|
{
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x54E0B6, DoSunAndMoon );
|
2016-07-26 18:26:14 +02:00
|
|
|
InjectHook(0x54E0B6, SunAndMoonFarClip);
|
|
|
|
|
|
|
|
Patch<const void*>(0x734DEA, &fSunFarClip);
|
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( !bSARender )
|
|
|
|
{
|
|
|
|
// Twopass rendering (experimental)
|
2017-09-28 21:43:16 +02:00
|
|
|
Patch<const void*>(0x76E230, MovingPropellerRender);
|
|
|
|
Patch<const void*>(0x76E160, MovingPropellerRender);
|
|
|
|
Patch(0x76E4F0, RenderBigVehicleActomic);
|
2017-09-12 16:08:22 +02:00
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Weapons rendering
|
2018-04-08 14:40:30 +02:00
|
|
|
if ( !bOutfit )
|
|
|
|
{
|
|
|
|
InjectHook(0x604DD9, RenderWeapon);
|
|
|
|
InjectHook(0x76D170, RenderWeaponPedsForPC, PATCH_JUMP);
|
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"EnableScriptFixes", -1, wcModulePath) == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
// Gym glitch fix
|
|
|
|
Patch<WORD>(0x476C2A, 0xCD8B);
|
|
|
|
Patch<DWORD>(0x476C31, 0x408B088B);
|
|
|
|
Patch<WORD>(0x476C35, 0x9004);
|
|
|
|
Nop(0x476C37, 1);
|
|
|
|
InjectHook(0x476C2C, &CRunningScript::GetDay_GymGlitch, PATCH_CALL);
|
|
|
|
|
|
|
|
// Basketball fix
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x4907AE, WipeLocalVariableMemoryForMissionScript );
|
|
|
|
ReadCall( 0x5EE017, TheScriptsLoad );
|
2015-04-22 15:20:40 +02:00
|
|
|
InjectHook(0x5EE017, TheScriptsLoad_BasketballFix);
|
|
|
|
// Fixed for Hoodlum
|
2016-03-13 13:33:52 +01:00
|
|
|
InjectHook(0x4907AE, StartNewMission_SCMFixes);
|
|
|
|
InjectHook(0x49072E, StartNewMission_SCMFixes);
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
2017-09-12 18:06:55 +02:00
|
|
|
if ( GetPrivateProfileIntW(L"SilentPatch", L"SmallSteamTexts", -1, wcModulePath) == 0 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
// We're on Steam - make texts bigger
|
|
|
|
Patch<const void*>(0x59A719, &dRetailSubtitleSizeY);
|
|
|
|
Patch<const void*>(0x59A7B7, &dRetailSubtitleSizeY2);
|
|
|
|
Patch<const void*>(0x59A8A1, &dRetailSubtitleSizeY2);
|
|
|
|
|
|
|
|
Patch<const void*>(0x59A737, &dRetailSubtitleSizeX);
|
|
|
|
Patch<const void*>(0x59A7D5, &dRetailSubtitleSizeX);
|
|
|
|
Patch<const void*>(0x59A8BF, &dRetailSubtitleSizeX);
|
|
|
|
|
|
|
|
Patch<const void*>(0x4F5A71, &dRetailRadioNamePosY);
|
|
|
|
Patch<const void*>(0x4F59A1, &dRetailRadioNameSizeY);
|
|
|
|
Patch<const void*>(0x4F59BF, &dRetailRadioNameSizeX);
|
|
|
|
}
|
|
|
|
|
2017-11-15 00:20:17 +01:00
|
|
|
if ( int INIoption = GetPrivateProfileIntW(L"SilentPatch", L"ColouredZoneNames", -1, wcModulePath); INIoption == 1 )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
2017-11-15 00:20:17 +01:00
|
|
|
// Coloured zone names
|
|
|
|
Patch<WORD>(0x598F65, 0x0C75);
|
|
|
|
Patch<WORD>(0x598F6B, 0x0675);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-11-15 00:20:17 +01:00
|
|
|
InjectHook(0x598F87, &CRGBA::BlendGangColour);
|
|
|
|
}
|
|
|
|
else if ( INIoption == 0 )
|
|
|
|
{
|
|
|
|
Patch<BYTE>(0x598F56, 0xEB);
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// ImVehFt conflicts
|
|
|
|
if ( !bHasImVehFt )
|
|
|
|
{
|
|
|
|
// Lights
|
|
|
|
InjectHook(0x4D2C06, LightMaterialsFix, PATCH_CALL);
|
|
|
|
|
|
|
|
// Flying components
|
|
|
|
InjectHook(0x5B80E0, &CObject::Render_Stub, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Cars getting dirty
|
|
|
|
// Only 1.0 and Steam
|
2017-04-10 13:23:39 +02:00
|
|
|
InjectHook( 0x5F2580, RemapDirt, PATCH_JUMP );
|
2015-04-22 15:20:40 +02:00
|
|
|
InjectHook(0x4D3F4D, &CVehicleModelInfo::FindEditableMaterialList, PATCH_CALL);
|
|
|
|
Patch<DWORD>(0x4D3F52, 0x0FEBCE8B);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !bHasImVehFt && !bSAMP )
|
|
|
|
{
|
|
|
|
// Properly random numberplates
|
|
|
|
DWORD* pVMT = *(DWORD**)0x4D1E9A;
|
|
|
|
Patch(&pVMT[7], &CVehicleModelInfo::Shutdown_Stub);
|
|
|
|
Patch<BYTE>(0x70C094, 0xEB);
|
|
|
|
InjectHook(0x4D3F65, &CVehicleModelInfo::SetCarCustomPlate);
|
|
|
|
InjectHook(0x711F28, &CVehicle::CustomCarPlate_TextureCreate);
|
|
|
|
InjectHook(0x71194D, &CVehicle::CustomCarPlate_BeforeRenderingStart);
|
|
|
|
InjectHook(0x736BD0, CCustomCarPlateMgr::SetupClumpAfterVehicleUpgrade, PATCH_JUMP);
|
|
|
|
//InjectMethodVP(0x6D0E53, CVehicle::CustomCarPlate_AfterRenderingStop, PATCH_NOTHING);
|
|
|
|
Nop(0x711948, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
// SSE conflicts
|
2017-10-03 21:03:23 +02:00
|
|
|
if ( moduleList.Get(L"shadows") == nullptr )
|
2015-04-22 15:20:40 +02:00
|
|
|
{
|
|
|
|
Patch<DWORD>(0x74A864, 0x52909090);
|
|
|
|
InjectHook(0x74A86A, &CShadowCamera::Update);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Bigger streamed entity linked lists
|
|
|
|
// Increase only if they're not increased already
|
|
|
|
if ( *(DWORD*)0x5D5780 == 12000 )
|
|
|
|
{
|
|
|
|
Patch<DWORD>(0x5D5720, 1250);
|
|
|
|
Patch<DWORD>(0x5D5780, 15000);
|
|
|
|
}
|
|
|
|
|
2017-04-27 16:17:38 +02:00
|
|
|
// Read CCustomCarPlateMgr::GeneratePlateText from here
|
|
|
|
// to work fine with Deji's Custom Plate Format
|
|
|
|
ReadCall( 0x4D3DA4, CCustomCarPlateMgr::GeneratePlateText );
|
2017-06-20 20:32:25 +02:00
|
|
|
|
2017-10-04 19:12:33 +02:00
|
|
|
FLAUtils::Init( moduleList );
|
2017-04-27 16:17:38 +02:00
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char aNoDesktopMode[64];
|
|
|
|
|
2016-04-24 20:37:14 +02:00
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
void Patch_SA_10()
|
|
|
|
{
|
2016-08-10 22:27:58 +02:00
|
|
|
using namespace Memory;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2017-04-10 12:32:31 +02:00
|
|
|
#if MEM_VALIDATORS
|
|
|
|
InstallMemValidator();
|
|
|
|
#endif
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// IsAlreadyRunning needs to be read relatively late - the later, the better
|
2017-09-20 20:41:58 +02:00
|
|
|
{
|
|
|
|
const uintptr_t pIsAlreadyRunning = AddressByRegion_10<uintptr_t>(0x74872D);
|
|
|
|
ReadCall( pIsAlreadyRunning, IsAlreadyRunning );
|
|
|
|
InjectHook(pIsAlreadyRunning, InjectDelayedPatches_10);
|
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Newsteam crash fix
|
|
|
|
pDirect = *(RpLight***)0x5BA573;
|
|
|
|
DarkVehiclesFix1_JumpBack = AddressByRegion_10<void*>(0x756D90);
|
|
|
|
|
2015-06-28 22:17:29 +02:00
|
|
|
// (Hopefully) more precise frame limiter
|
2017-09-20 20:41:58 +02:00
|
|
|
{
|
|
|
|
uintptr_t pAddress = AddressByRegion_10<uintptr_t>(0x748D9B);
|
|
|
|
ReadCall( pAddress, RsEventHandler );
|
|
|
|
InjectHook(pAddress, NewFrameRender);
|
|
|
|
InjectHook(AddressByRegion_10<uintptr_t>(0x748D1F), GetTimeSinceLastFrame);
|
|
|
|
}
|
2015-06-28 22:17:29 +02:00
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// Set CAEDataStream to use an old structure
|
|
|
|
CAEDataStream::SetStructType(false);
|
|
|
|
|
|
|
|
//Patch<BYTE>(0x5D7265, 0xEB);
|
|
|
|
|
|
|
|
// Heli rotors
|
|
|
|
InjectHook(0x6CAB70, &CPlane::Render_Stub, PATCH_JUMP);
|
|
|
|
InjectHook(0x6C4400, &CHeli::Render_Stub, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Boats
|
|
|
|
/*Patch<BYTE>(0x4C79DF, 0x19);
|
|
|
|
Patch<DWORD>(0x733A87, EXPAND_BOAT_ALPHA_ATOMIC_LISTS * sizeof(AlphaObjectInfo));
|
|
|
|
Patch<DWORD>(0x733AD7, EXPAND_BOAT_ALPHA_ATOMIC_LISTS * sizeof(AlphaObjectInfo));*/
|
|
|
|
|
|
|
|
// Fixed strafing? Hopefully
|
|
|
|
/*static const float fStrafeCheck = 0.1f;
|
|
|
|
Patch<const void*>(0x61E0C2, &fStrafeCheck);
|
|
|
|
Nop(0x61E0CA, 6);*/
|
|
|
|
|
|
|
|
// RefFix
|
|
|
|
static const float fRefZVal = 1.0f;
|
|
|
|
static const float* const pRefFal = &fRefZVal;
|
|
|
|
|
|
|
|
Patch<const void*>(0x6FB97A, &pRefFal);
|
|
|
|
Patch<BYTE>(0x6FB9A0, 0);
|
|
|
|
|
|
|
|
// Plane rotors
|
|
|
|
InjectHook(0x4C7981, PlaneAtomicRendererSetup, PATCH_JUMP);
|
|
|
|
|
|
|
|
// DOUBLE_RWHEELS
|
|
|
|
Patch<WORD>(0x4C9290, 0xE281);
|
|
|
|
Patch<int>(0x4C9292, ~(rwMATRIXTYPEMASK|rwMATRIXINTERNALIDENTITY));
|
|
|
|
|
|
|
|
// A fix for DOUBLE_RWHEELS trailers
|
|
|
|
InjectHook(0x4C9223, TrailerDoubleRWheelsFix, PATCH_JUMP);
|
|
|
|
InjectHook(0x4C92F4, TrailerDoubleRWheelsFix2, PATCH_JUMP);
|
|
|
|
|
|
|
|
// No framedelay
|
|
|
|
Patch<WORD>(0x53E923, 0x43EB);
|
|
|
|
Patch<BYTE>(0x53E99F, 0x10);
|
|
|
|
Nop(0x53E9A5, 1);
|
|
|
|
|
|
|
|
// Disable re-initialization of DirectInput mouse device by the game
|
|
|
|
Patch<BYTE>(0x576CCC, 0xEB);
|
|
|
|
Patch<BYTE>(0x576EBA, 0xEB);
|
|
|
|
Patch<BYTE>(0x576F8A, 0xEB);
|
|
|
|
|
|
|
|
// Make sure DirectInput mouse device is set non-exclusive (may not be needed?)
|
|
|
|
Patch<DWORD>(AddressByRegion_10<DWORD>(0x7469A0), 0x9090C030);
|
|
|
|
|
|
|
|
// Hunter interior & static_rotor for helis
|
|
|
|
InjectHook(0x4C78F2, HunterTest, PATCH_JUMP);
|
|
|
|
InjectHook(0x4C9618, CacheCRC32);
|
|
|
|
|
|
|
|
// Fixed blown up car rendering
|
|
|
|
// ONLY 1.0
|
|
|
|
InjectHook(0x5D993F, DarkVehiclesFix1);
|
|
|
|
InjectHook(0x5D9A74, DarkVehiclesFix2, PATCH_JUMP);
|
|
|
|
InjectHook(0x5D9B44, DarkVehiclesFix3, PATCH_JUMP);
|
|
|
|
InjectHook(0x5D9CB2, DarkVehiclesFix4, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Bindable NUM5
|
|
|
|
// Only 1.0 and Steam
|
|
|
|
Nop(0x57DC55, 2);
|
|
|
|
|
|
|
|
|
|
|
|
// TEMP
|
|
|
|
//Patch<DWORD>(0x733B05, 40);
|
|
|
|
//Patch<DWORD>(0x733B55, 40);
|
|
|
|
//Patch<BYTE>(0x5B3ADD, 4);
|
|
|
|
|
|
|
|
// Lightbeam fix
|
2017-06-20 20:32:25 +02:00
|
|
|
Nop(0x6A2E95, 3);
|
2015-04-22 15:20:40 +02:00
|
|
|
Patch<WORD>(0x6E0F63, 0x0AEB);
|
|
|
|
Patch<WORD>(0x6E0F7C, 0x0BEB);
|
|
|
|
Patch<WORD>(0x6E0F95, 0x0BEB);
|
|
|
|
Patch<WORD>(0x6E0FAF, 0x1AEB);
|
|
|
|
|
|
|
|
Patch<WORD>(0x6E13D5, 0x09EB);
|
|
|
|
Patch<WORD>(0x6E13ED, 0x17EB);
|
|
|
|
Patch<WORD>(0x6E141F, 0x0AEB);
|
|
|
|
|
|
|
|
Patch<BYTE>(0x6E0FE0, 0x28);
|
|
|
|
Patch<BYTE>(0x6E142D, 0x18);
|
|
|
|
Patch<BYTE>(0x6E0FDB, 0xC8-0x7C);
|
|
|
|
//InjectHook(0x6A2EDA, CullTest);
|
|
|
|
|
|
|
|
InjectHook(0x6A2EF7, ResetAlphaFuncRefAfterRender, PATCH_JUMP);
|
|
|
|
|
|
|
|
// PS2 SUN!!!!!!!!!!!!!!!!!
|
|
|
|
Nop(0x6FB17C, 3);
|
|
|
|
|
|
|
|
#if defined EXPAND_ALPHA_ENTITY_LISTS
|
|
|
|
// Bigger alpha entity lists
|
|
|
|
Patch<DWORD>(0x733B05, EXPAND_ALPHA_ENTITY_LISTS * 20);
|
|
|
|
Patch<DWORD>(0x733B55, EXPAND_ALPHA_ENTITY_LISTS * 20);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// Unlocked widescreen resolutions
|
|
|
|
//Patch<DWORD>(0x745B71, 0x9090687D);
|
|
|
|
Patch<DWORD>(0x745B81, 0x9090587D);
|
|
|
|
Patch<DWORD>(0x74596C, 0x9090127D);
|
|
|
|
Nop(0x745970, 2);
|
|
|
|
//Nop(0x745B75, 2);
|
|
|
|
Nop(0x745B85, 2);
|
|
|
|
Nop(0x7459E1, 2);
|
|
|
|
|
|
|
|
// Heap corruption fix
|
|
|
|
Nop(0x5C25D3, 5);
|
|
|
|
|
|
|
|
// User Tracks fix
|
2017-04-12 21:33:23 +02:00
|
|
|
ReadCall( 0x4D9B66, SetVolume );
|
2015-04-22 15:20:40 +02:00
|
|
|
InjectHook(0x4D9B66, UserTracksFix);
|
|
|
|
InjectHook(0x4D9BB5, 0x4F2FD0);
|
|
|
|
|
|
|
|
// FLAC support
|
|
|
|
InjectHook(0x4F373D, LoadFLAC, PATCH_JUMP);
|
|
|
|
InjectHook(0x57BEFE, FLACInit);
|
|
|
|
InjectHook(0x4F3787, CAEWaveDecoderInit);
|
|
|
|
|
|
|
|
Patch<WORD>(0x4F376A, 0x18EB);
|
|
|
|
//Patch<BYTE>(0x4F378F, sizeof(CAEWaveDecoder));
|
|
|
|
Patch<const void*>(0x4F3210, UserTrackExtensions);
|
|
|
|
Patch<const void*>(0x4F3241, &UserTrackExtensions->Codec);
|
|
|
|
Patch<const void*>(0x4F35E7, &UserTrackExtensions[1].Codec);
|
|
|
|
Patch<BYTE>(0x4F322D, sizeof(UserTrackExtensions));
|
|
|
|
|
|
|
|
// Impound garages working correctly
|
2017-09-15 20:24:26 +02:00
|
|
|
InjectHook(0x425179, 0x448990); // CGarages::IsPointWithinAnyGarage
|
|
|
|
InjectHook(0x425369, 0x448990); // CGarages::IsPointWithinAnyGarage
|
|
|
|
InjectHook(0x425411, 0x448990); // CGarages::IsPointWithinAnyGarage
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Impounding after busted works
|
|
|
|
Nop(0x443292, 5);
|
|
|
|
|
|
|
|
// Mouse rotates an airbone car only with Steer with Mouse option enabled
|
|
|
|
bool* bEnableMouseSteering = *(bool**)0x6AD7AD; // CVehicle::m_bEnableMouseSteering
|
|
|
|
Patch<bool*>(0x6B4EC0, bEnableMouseSteering);
|
|
|
|
Patch<bool*>(0x6CE827, bEnableMouseSteering);
|
|
|
|
|
|
|
|
// Patched CAutomobile::Fix
|
|
|
|
// misc_x parts don't get reset (Bandito fix), Towtruck's bouncing panel is not reset
|
|
|
|
Patch<WORD>(0x6A34C9, 0x5EEB);
|
|
|
|
Patch<DWORD>(0x6A3555, 0x5E5FCF8B);
|
|
|
|
Patch<DWORD>(0x6A3559, 0x448B5B5D);
|
|
|
|
Patch<DWORD>(0x6A355D, 0x89644824);
|
|
|
|
Patch<DWORD>(0x6A3561, 5);
|
|
|
|
Patch<DWORD>(0x6A3565, 0x54C48300);
|
|
|
|
InjectHook(0x6A3569, &CAutomobile::Fix_SilentPatch, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Patched CPlane::Fix
|
|
|
|
// Doors don't get reset (they can't get damaged anyway), bouncing panels DO reset
|
|
|
|
// but not on Vortex
|
|
|
|
Patch<BYTE>(0x6CABD0, 0xEB);
|
|
|
|
Patch<DWORD>(0x6CAC05, 0x5E5FCF8B);
|
|
|
|
InjectHook(0x6CAC09, &CPlane::Fix_SilentPatch, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Weapon icon fix (crosshairs mess up rwRENDERSTATEZWRITEENABLE)
|
|
|
|
// Only 1.0 and 1.01, Steam somehow fixed it (not the same way though)
|
|
|
|
Nop(0x58E210, 3);
|
|
|
|
Nop(0x58EAB7, 3);
|
|
|
|
Nop(0x58EAE1, 3);
|
|
|
|
|
|
|
|
// Zones fix
|
|
|
|
// Only 1.0 and Steam
|
|
|
|
InjectHook(0x572130, GetCurrentZoneLockedOrUnlocked, PATCH_JUMP);
|
|
|
|
|
|
|
|
// CGarages::RespraysAreFree resetting on new game
|
|
|
|
Patch<WORD>(0x448BD8, 0x8966);
|
|
|
|
Patch<BYTE>(0x448BDA, 0x0D);
|
|
|
|
Patch<bool*>(0x448BDB, *(bool**)0x44AC98);
|
|
|
|
Patch<BYTE>(0x448BDF, 0xC3);
|
|
|
|
|
|
|
|
// Bilinear filtering for license plates
|
|
|
|
//Patch<BYTE>(0x6FD528, rwFILTERLINEAR);
|
|
|
|
Patch<BYTE>(0x6FDF47, rwFILTERLINEAR);
|
|
|
|
|
|
|
|
// -//- Roadsign maganer
|
|
|
|
//Patch<BYTE>(0x6FE147, rwFILTERLINEAR);
|
|
|
|
|
|
|
|
// Bilinear filtering with mipmaps for weapon icons
|
|
|
|
Patch<BYTE>(0x58D7DA, rwFILTERMIPLINEAR);
|
|
|
|
|
|
|
|
// Illumination value from timecyc.dat properly using floats
|
|
|
|
Patch<WORD>(0x5BBFC9, 0x14EB);
|
|
|
|
|
|
|
|
// Illumination defaults to 1.0
|
|
|
|
Patch<DWORD>(0x5BBB04, 0xCC2484C7);
|
|
|
|
Patch<DWORD>(0x5BBB08, 0x00000000);
|
|
|
|
Patch<DWORD>(0x5BBB0C, 0x903F8000);
|
|
|
|
|
|
|
|
// All lights get casted at vehicles
|
|
|
|
Patch<BYTE>(0x5D9A88, 8);
|
|
|
|
Patch<BYTE>(0x5D9A91, 8);
|
|
|
|
Patch<BYTE>(0x5D9F1F, 8);
|
|
|
|
|
|
|
|
// 6 extra directionals on Medium and higher
|
2017-12-26 01:59:22 +01:00
|
|
|
// push eax
|
|
|
|
// call GetMaxExtraDirectionals
|
|
|
|
// add esp, 4
|
|
|
|
// mov ebx, eax
|
|
|
|
// nop
|
|
|
|
Patch<uint8_t>( 0x735881, 0x50 );
|
|
|
|
InjectHook( 0x735881 + 1, GetMaxExtraDirectionals, PATCH_CALL );
|
|
|
|
Patch( 0x735881 + 6, { 0x83, 0xC4, 0x04, 0x8B, 0xD8 } );
|
|
|
|
Nop( 0x735881 + 11, 3 );
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Default resolution to native resolution
|
|
|
|
RECT desktop;
|
|
|
|
GetWindowRect(GetDesktopWindow(), &desktop);
|
2016-03-31 19:51:14 +02:00
|
|
|
sprintf_s(aNoDesktopMode, "Cannot find %dx%dx32 video mode", desktop.right, desktop.bottom);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
Patch<DWORD>(0x746363, desktop.right);
|
|
|
|
Patch<DWORD>(0x746368, desktop.bottom);
|
|
|
|
Patch<const char*>(0x7463C8, aNoDesktopMode);
|
|
|
|
|
|
|
|
// Corrected Map screen 1px issue
|
|
|
|
Patch<float>(0x575DE7, -0.5f);
|
|
|
|
Patch<float>(0x575DA7, -0.5f);
|
|
|
|
Patch<float>(0x575DAF, -0.5f);
|
|
|
|
Patch<float>(0x575D5C, -0.5f);
|
|
|
|
Patch<float>(0x575CDA, -0.5f);
|
|
|
|
Patch<float>(0x575D0C, -0.5f);
|
|
|
|
|
|
|
|
// Cars drive on water cheat
|
|
|
|
Patch<DWORD>(&(*(DWORD**)0x438513)[34], 0xE5FC92C3);
|
|
|
|
|
|
|
|
// No DirectPlay dependency
|
|
|
|
Patch<BYTE>(AddressByRegion_10<DWORD>(0x74754A), 0xB8);
|
|
|
|
Patch<DWORD>(AddressByRegion_10<DWORD>(0x74754B), 0x900);
|
|
|
|
|
2015-04-23 17:32:18 +02:00
|
|
|
// SHGetFolderPath on User Files
|
2017-09-18 22:13:02 +02:00
|
|
|
InjectHook(0x744FB0, GetMyDocumentsPathSA, PATCH_JUMP);
|
2015-04-23 17:32:18 +02:00
|
|
|
|
2015-09-20 21:21:36 +02:00
|
|
|
// Fixed muzzleflash not showing from last bullet
|
|
|
|
Nop(0x61ECE4, 2);
|
|
|
|
|
|
|
|
// Proper randomizations
|
|
|
|
InjectHook(0x44E82E, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x44ECEE, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x666EA0, Int32Rand); // Prostitutes
|
|
|
|
|
|
|
|
// Help boxes showing with big message
|
|
|
|
// Game seems to assume they can show together
|
|
|
|
Nop(0x58BA8F, 6);
|
|
|
|
|
2016-01-11 23:55:25 +01:00
|
|
|
// Fixed lens flare
|
|
|
|
Patch<DWORD>(0x70F45A, 0);
|
|
|
|
Patch<BYTE>(0x6FB621, 0xC3);
|
|
|
|
Patch<BYTE>(0x6FB600, 0x21);
|
|
|
|
InjectHook(0x6FB622, 0x70CF20, PATCH_CALL);
|
|
|
|
Patch<WORD>(0x6FB627, 0xDCEB);
|
|
|
|
|
|
|
|
Patch<WORD>(0x6FB476, 0xB990);
|
|
|
|
Patch(0x6FB478, &FlushLensSwitchZ);
|
|
|
|
Patch<WORD>(0x6FB480, 0xD1FF);
|
|
|
|
Nop(0x6FB482, 1);
|
|
|
|
|
|
|
|
Patch<WORD>(0x6FAF28, 0xB990);
|
|
|
|
Patch(0x6FAF2A, &InitBufferSwitchZ);
|
|
|
|
Patch<WORD>(0x6FAF32, 0xD1FF);
|
|
|
|
Nop(0x6FAF34, 1);
|
|
|
|
|
2016-03-11 23:54:20 +01:00
|
|
|
// Y axis sensitivity fix
|
|
|
|
// By ThirteenAG
|
|
|
|
float* sens = *(float**)0x50F03C;
|
|
|
|
Patch<const void*>(0x50EB70 + 0x4D6 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x50F970 + 0x1B6 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x5105C0 + 0x666 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x511B50 + 0x2B8 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x521500 + 0xD8C + 0x2, sens);
|
|
|
|
|
2016-03-12 15:47:28 +01:00
|
|
|
// Don't lock mouse Y axis during fadeins
|
|
|
|
Patch<WORD>(0x50FBB4, 0x27EB);
|
|
|
|
Patch<WORD>(0x510512, 0xE990);
|
|
|
|
InjectHook(0x524071, 0x524139, PATCH_JUMP);
|
2016-01-11 23:55:25 +01:00
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
// Fixed mirrors crash
|
|
|
|
Patch<uint64_t>(0x7271CB, 0xC604C4833474C085);
|
|
|
|
|
|
|
|
// Mirrors depth fix & bumped quality
|
|
|
|
InjectHook(0x72701D, CreateMirrorBuffers);
|
|
|
|
|
|
|
|
// Fixed MSAA options
|
|
|
|
Patch<BYTE>(0x57D126, 0xEB);
|
|
|
|
Nop(0x57D0E8, 2);
|
|
|
|
|
|
|
|
Patch<BYTE>(AddressByRegion_10<BYTE*>(0x7F6C9B), 0xEB);
|
|
|
|
Patch<BYTE>(AddressByRegion_10<BYTE*>(0x7F60C6), 0xEB);
|
|
|
|
Patch<WORD>(AddressByRegion_10<BYTE*>(0x7F6683), 0xE990);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x57D136, orgGetMaxMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x57D136, GetMaxMultiSamplingLevels);
|
|
|
|
InjectHook(0x57D0EA, GetMaxMultiSamplingLevels);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x5744FD, orgChangeMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x5744FD, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x57D162, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x57D2A6, ChangeMultiSamplingLevels);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x746350, orgSetMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x746350, SetMultiSamplingLevels);
|
|
|
|
|
|
|
|
Nop(0x57A0FC, 1);
|
|
|
|
InjectHook(0x57A0FD, MSAAText, PATCH_CALL);
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed car collisions - car you're hitting gets proper damage now
|
|
|
|
InjectHook(0x5428EA, FixedCarDamage, PATCH_CALL);
|
|
|
|
|
2016-04-22 20:45:33 +02:00
|
|
|
|
|
|
|
// Car explosion crash with multimonitor
|
|
|
|
// Unitialized collision data breaking stencil shadows
|
2016-05-28 20:14:29 +02:00
|
|
|
{
|
2017-09-20 20:41:58 +02:00
|
|
|
uintptr_t pHoodlumCompat;
|
|
|
|
if ( *(uint8_t*)0x40F870 == 0xE9 )
|
|
|
|
ReadCall( 0x40F870, pHoodlumCompat );
|
2016-05-28 20:14:29 +02:00
|
|
|
else
|
|
|
|
pHoodlumCompat = 0x40F870;
|
|
|
|
|
2017-09-20 20:41:58 +02:00
|
|
|
const uintptr_t pMemMgrMalloc = pHoodlumCompat + 0x63;
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( pMemMgrMalloc, orgMemMgrMalloc );
|
2017-03-14 21:06:58 +01:00
|
|
|
VP::InjectHook(pMemMgrMalloc, CollisionData_MallocAndInit);
|
2016-05-28 20:14:29 +02:00
|
|
|
}
|
|
|
|
{
|
2017-09-20 20:41:58 +02:00
|
|
|
uintptr_t pHoodlumCompat, pHoodlumCompat2;
|
|
|
|
if ( *(uint8_t*)0x40F740 == 0xE9 )
|
2016-05-28 20:14:29 +02:00
|
|
|
{
|
2017-09-20 20:41:58 +02:00
|
|
|
ReadCall( 0x40F740, pHoodlumCompat );
|
|
|
|
ReadCall( 0x40F810, pHoodlumCompat2 );
|
2016-05-28 20:14:29 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pHoodlumCompat = 0x40F740;
|
|
|
|
pHoodlumCompat2 = 0x40F810;
|
|
|
|
}
|
|
|
|
|
2017-09-20 20:41:58 +02:00
|
|
|
const uintptr_t pNewAlloc = pHoodlumCompat + 0xC;
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( pNewAlloc, orgNewAlloc );
|
2017-03-14 21:06:58 +01:00
|
|
|
VP::InjectHook(pHoodlumCompat + 0xC, CollisionData_NewAndInit);
|
|
|
|
VP::InjectHook(pHoodlumCompat2 + 0xD, CollisionData_NewAndInit);
|
2016-05-28 20:14:29 +02:00
|
|
|
}
|
2016-04-22 20:45:33 +02:00
|
|
|
|
|
|
|
|
2016-04-22 21:42:10 +02:00
|
|
|
// Crash when entering advanced display options on a dual monitor machine after:
|
|
|
|
// - starting game on primary monitor in maximum resolution, exiting,
|
|
|
|
// starting again in maximum resolution on secondary monitor.
|
|
|
|
// Secondary monitor maximum resolution had to be greater than maximum resolution of primary monitor.
|
2016-05-28 22:44:33 +02:00
|
|
|
// Not in 1.01
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x745B1E, orgGetNumVideoModes );
|
2016-04-22 21:42:10 +02:00
|
|
|
InjectHook(0x745B1E, GetNumVideoModes_Store);
|
|
|
|
InjectHook(0x745A81, GetNumVideoModes_Retrieve);
|
|
|
|
|
|
|
|
|
2016-04-24 20:37:14 +02:00
|
|
|
// Fixed escalators crash
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x7185B5, orgEscalatorsUpdate );
|
2016-04-24 20:37:14 +02:00
|
|
|
InjectHook(0x7185B5, UpdateEscalators);
|
|
|
|
InjectHook(0x71791F, &CEscalator::SwitchOffNoRemove);
|
2016-04-24 22:00:51 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Don't allocate constant memory for stencil shadows every frame
|
|
|
|
InjectHook(0x711DD5, StencilShadowAlloc, PATCH_CALL);
|
|
|
|
Nop(0x711E0D, 3);
|
|
|
|
Patch<WORD>(0x711DDA, 0x2CEB);
|
|
|
|
Patch<DWORD>(0x711E5F, 0x90C35D5F); // pop edi, pop ebp, ret
|
2016-07-26 19:43:45 +02:00
|
|
|
|
|
|
|
|
|
|
|
// "Streaming memory bug" fix
|
|
|
|
InjectHook(0x4C51A9, GTARtAnimInterpolatorSetCurrentAnim);
|
2016-04-24 20:37:14 +02:00
|
|
|
|
2016-07-27 02:00:18 +02:00
|
|
|
|
|
|
|
// Fixed ammo for melee weapons in cheats
|
|
|
|
Patch<BYTE>(0x43890B+1, 1); // knife
|
|
|
|
Patch<BYTE>(0x4389F8+1, 1); // knife
|
|
|
|
Patch<BYTE>(0x438B9F+1, 1); // chainsaw
|
|
|
|
Patch<BYTE>(0x438C58+1, 1); // chainsaw
|
|
|
|
Patch<BYTE>(0x4395C8+1, 1); // parachute
|
|
|
|
|
|
|
|
Patch<BYTE>(0x439F1F, 0x53); // katana
|
|
|
|
Patch<WORD>(0x439F20, 0x016A);
|
|
|
|
|
2016-04-24 20:37:14 +02:00
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// Fixed police scanner names
|
|
|
|
char* pScannerNames = *(char**)0x4E72D4;
|
2017-04-09 20:25:19 +02:00
|
|
|
strcpy_s(pScannerNames + (8*113), 8, "WESTP");
|
|
|
|
strcpy_s(pScannerNames + (8*134), 8, "????");
|
2016-11-20 15:54:59 +01:00
|
|
|
|
2017-03-04 15:17:59 +01:00
|
|
|
|
|
|
|
// AI accuracy issue
|
|
|
|
Nop(0x73B3AE, 1);
|
2017-03-06 12:11:13 +01:00
|
|
|
InjectHook( 0x73B3AE + 1, WeaponRangeMult_VehicleCheck, PATCH_CALL );
|
2017-03-07 00:40:37 +01:00
|
|
|
|
|
|
|
|
2017-03-20 21:10:50 +01:00
|
|
|
// New timers fix
|
|
|
|
InjectHook( 0x561C32, asmTimers_ftol_PauseMode );
|
|
|
|
InjectHook( 0x561902, asmTimers_ftol_NonClipped );
|
|
|
|
InjectHook( 0x56191A, asmTimers_ftol );
|
2017-04-10 01:01:43 +02:00
|
|
|
InjectHook( 0x46A036, asmTimers_SCMdelta );
|
2017-03-20 21:10:50 +01:00
|
|
|
|
|
|
|
|
2017-03-07 00:40:37 +01:00
|
|
|
// Don't catch WM_SYSKEYDOWN and WM_SYSKEYUP (fixes Alt+F4)
|
2017-03-18 15:15:57 +01:00
|
|
|
InjectHook( AddressByRegion_10<int>(0x748220), AddressByRegion_10<int>(0x748446), PATCH_JUMP );
|
|
|
|
Patch<uint8_t>( AddressByRegion_10<int>(0x7481E3), 0x5C ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( AddressByRegion_10<int>(0x7481EA), 0x53 ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( AddressByRegion_10<int>(0x74820D), 0xFB ); // esi -> ebx
|
|
|
|
Patch<int8_t>( AddressByRegion_10<int>(0x7481EF), 0x54-0x3C ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( AddressByRegion_10<int>(0x748200), 0x4C-0x3C ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( AddressByRegion_10<int>(0x748214), 0x4C-0x3C ); // use stack space for new lParam
|
|
|
|
|
|
|
|
InjectHook( AddressByRegion_10<int>(0x74826A), AddressByRegion_10<int>(0x748446), PATCH_JUMP );
|
|
|
|
Patch<uint8_t>( AddressByRegion_10<int>(0x74822D), 0x5C ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( AddressByRegion_10<int>(0x748234), 0x53 ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( AddressByRegion_10<int>(0x748257), 0xFB ); // esi -> ebx
|
|
|
|
Patch<int8_t>( AddressByRegion_10<int>(0x748239), 0x54-0x3C ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( AddressByRegion_10<int>(0x74824A), 0x4C-0x3C ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( AddressByRegion_10<int>(0x74825E), 0x4C-0x3C ); // use stack space for new lParam
|
2017-03-10 16:19:05 +01:00
|
|
|
|
|
|
|
|
|
|
|
// Reinit CCarCtrl fields (firetruck and ambulance generation)
|
|
|
|
ReadCall( 0x53BD5B, orgCarCtrlReInit );
|
|
|
|
InjectHook(0x53BD5B, CarCtrlReInit_SilentPatch);
|
2017-03-10 23:54:04 +01:00
|
|
|
|
|
|
|
|
|
|
|
// FuckCarCompletely not fixing panels
|
|
|
|
Nop(0x6C268D, 3);
|
2017-03-11 18:48:04 +01:00
|
|
|
|
|
|
|
|
|
|
|
// 014C cargen counter fix (by spaceeinstein)
|
|
|
|
Patch<uint8_t>( 0x06F3E2C + 1, 0xBF ); // movzx ecx, ax -> movsx ecx, ax
|
|
|
|
Patch<uint8_t>( 0x6F3E32, 0x74 ); // jge -> jz
|
2017-03-20 22:52:41 +01:00
|
|
|
|
|
|
|
|
|
|
|
// Linear filtering on script sprites
|
|
|
|
ReadCall( 0x58C092, orgDrawScriptSpritesAndRectangles );
|
|
|
|
InjectHook( 0x58C092, DrawScriptSpritesAndRectangles );
|
|
|
|
|
2017-03-25 13:46:07 +01:00
|
|
|
|
2017-04-09 23:17:31 +02:00
|
|
|
// Properly initialize all CVehicleModelInfo fields
|
|
|
|
ReadCall( 0x4C75E4, orgVehicleModelInfoCtor );
|
|
|
|
InjectHook( 0x4C75E4, VehicleModelInfoCtor );
|
2017-06-23 00:11:17 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Animated Phoenix hood scoop
|
2017-09-09 23:39:30 +02:00
|
|
|
auto* automobilePreRender = &(*(decltype(CAutomobile::orgAutomobilePreRender)**)(0x6B0AD2 + 2))[17];
|
|
|
|
CAutomobile::orgAutomobilePreRender = *automobilePreRender;
|
2017-06-23 00:11:17 +02:00
|
|
|
Patch(automobilePreRender, &CAutomobile::PreRender_Stub);
|
|
|
|
|
|
|
|
InjectHook(0x6C7E7A, &CAutomobile::PreRender_Stub);
|
|
|
|
InjectHook(0x6CEAEC, &CAutomobile::PreRender_Stub);
|
|
|
|
InjectHook(0x6CFADC, &CAutomobile::PreRender_Stub);
|
2017-06-25 14:09:30 +02:00
|
|
|
|
|
|
|
|
2017-09-09 23:39:30 +02:00
|
|
|
// Extra animations for planes
|
|
|
|
auto* planePreRender = &(*(decltype(CPlane::orgPlanePreRender)**)(0x6C8E5A + 2))[17];
|
|
|
|
CPlane::orgPlanePreRender = *planePreRender;
|
|
|
|
Patch(planePreRender, &CPlane::PreRender_Stub);
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed animations for boats
|
2018-04-02 21:01:11 +02:00
|
|
|
ReadCall( 0x6F119E, CVehicle::orgVehiclePreRender );
|
2017-09-09 23:39:30 +02:00
|
|
|
InjectHook( 0x6F119E, &CBoat::PreRender_SilentPatch );
|
|
|
|
|
|
|
|
|
2017-06-25 14:09:30 +02:00
|
|
|
// Stop BF Injection/Bandito/Hotknife rotating engine components when engine is off
|
|
|
|
Patch<const void*>(0x6AC2BE + 2, &CAutomobile::ms_engineCompSpeed);
|
|
|
|
Patch<const void*>(0x6ACB91 + 2, &CAutomobile::ms_engineCompSpeed);
|
2017-09-09 18:47:07 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Make freeing temp objects more aggressive to fix vending crash
|
|
|
|
InjectHook( 0x5A1840, CObject::TryToFreeUpTempObjects_SilentPatch, PATCH_JUMP );
|
2017-09-12 13:31:57 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Remove FILE_FLAG_NO_BUFFERING from CdStreams
|
|
|
|
Patch<uint8_t>( 0x406BC6, 0xEB );
|
2017-09-12 22:35:45 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Proper metric-imperial conversion constants
|
|
|
|
static const float METERS_TO_FEET = 3.280839895f;
|
|
|
|
Patch<const void*>( 0x55942F + 2, &METERS_TO_FEET );
|
|
|
|
Patch<const void*>( 0x55AA96 + 2, &METERS_TO_FEET );
|
2017-09-15 20:24:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Fixed impounding of random vehicles (because CVehicle::~CVehicle doesn't remove cars from apCarsToKeep)
|
|
|
|
ReadCall( 0x6E2B6E, orgRecordVehicleDeleted );
|
|
|
|
InjectHook( 0x6E2B6E, RecordVehicleDeleted_AndRemoveFromVehicleList );
|
2017-09-19 00:47:38 +02:00
|
|
|
|
|
|
|
|
2017-09-19 21:40:48 +02:00
|
|
|
// Don't include an extra D3DLIGHT on vehicles since we fixed directional already
|
|
|
|
// By aap
|
|
|
|
Patch<float>(0x5D88D1 + 6, 0);
|
|
|
|
Patch<float>(0x5D88DB + 6, 0);
|
|
|
|
Patch<float>(0x5D88E5 + 6, 0);
|
|
|
|
|
|
|
|
Patch<float>(0x5D88F9 + 6, 0);
|
|
|
|
Patch<float>(0x5D8903 + 6, 0);
|
|
|
|
Patch<float>(0x5D890D + 6, 0);
|
2017-09-23 19:34:28 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Fixed CAEAudioUtility timers - not typecasting to float so we're not losing precision after X days of PC uptime
|
|
|
|
// Also fixed integer division by zero
|
|
|
|
Patch( 0x5B9868 + 2, &pAudioUtilsFrequency );
|
|
|
|
InjectHook( 0x5B9886, AudioUtilsGetStartTime );
|
|
|
|
InjectHook( 0x4D9E80, AudioUtilsGetCurrentTimeInMs, PATCH_JUMP );
|
2017-09-23 21:04:46 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Car generators placed in interiors visible everywhere
|
|
|
|
InjectHook( 0x6F3B30, &CEntity::SetPositionAndAreaCode );
|
2017-09-24 14:35:10 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Fixed bomb ownership/bombs saving for bikes
|
|
|
|
{
|
2018-04-22 00:18:12 +02:00
|
|
|
ReadCall( 0x44856A, CStoredCar::orgRestoreCar );
|
2017-09-24 14:35:10 +02:00
|
|
|
InjectHook( 0x44856A, &CStoredCar::RestoreCar_SilentPatch );
|
|
|
|
InjectHook( 0x4485DB, &CStoredCar::RestoreCar_SilentPatch );
|
|
|
|
}
|
|
|
|
|
2017-10-03 22:24:01 +02:00
|
|
|
|
|
|
|
// unnamed CdStream semaphore
|
|
|
|
Patch( 0x406945, { 0x6A, 0x00 } ); // push 0 \ nop
|
|
|
|
Nop( 0x406945 + 2, 3 );
|
2018-01-11 21:45:59 +01:00
|
|
|
|
|
|
|
|
|
|
|
// Correct streaming when using RC vehicles
|
|
|
|
InjectHook( 0x55574B, FindPlayerEntityWithRC );
|
|
|
|
InjectHook( 0x5557C3, FindPlayerVehicle_RCWrap );
|
2018-01-26 18:18:36 +01:00
|
|
|
|
|
|
|
|
2018-02-11 13:58:10 +01:00
|
|
|
// TODO: Verify this fix, might be causing crashes atm and too risky to include
|
|
|
|
#if 0
|
2018-01-26 18:18:36 +01:00
|
|
|
// Fixed CPlayerInfo assignment operator
|
|
|
|
InjectHook( 0x45DEF0, &CPlayerInfo::operator=, PATCH_JUMP );
|
2018-02-11 13:58:10 +01:00
|
|
|
#endif
|
2018-01-26 18:18:52 +01:00
|
|
|
|
|
|
|
|
|
|
|
// Fixed triangle above recruitable peds' heads
|
|
|
|
Patch<uint8_t>( 0x60BC52 + 2, 8 ); // GANG2
|
2018-01-28 14:21:27 +01:00
|
|
|
|
|
|
|
|
|
|
|
// Credits =)
|
|
|
|
ReadCall( 0x5AF87A, Credits::PrintCreditText );
|
2018-04-28 16:44:36 +02:00
|
|
|
ReadCall( 0x5AF8A4, Credits::PrintCreditText_Hooked );
|
2018-01-28 14:21:27 +01:00
|
|
|
InjectHook( 0x5AF8A4, Credits::PrintSPCredits );
|
2018-01-28 18:30:52 +01:00
|
|
|
|
|
|
|
|
|
|
|
// Fixed ammo from SCM
|
|
|
|
{
|
2018-04-22 00:18:12 +02:00
|
|
|
ReadCall( 0x47D335, CPed::orgGiveWeapon );
|
2018-01-28 18:30:52 +01:00
|
|
|
InjectHook( 0x47D335, &CPed::GiveWeapon_SP );
|
|
|
|
}
|
2018-02-17 13:59:44 +01:00
|
|
|
|
|
|
|
// Fixed bicycle on fire - instead of CJ being set on fire, bicycle's driver is
|
|
|
|
{
|
|
|
|
using namespace BicycleFire;
|
|
|
|
|
2018-05-19 21:26:00 +02:00
|
|
|
Patch( 0x53A984, { 0x90, 0x57 } ); // nop \ push edi
|
|
|
|
Patch( 0x53A9A7, { 0x90, 0x57 } ); // nop \ push edi
|
|
|
|
InjectHook( 0x53A984 + 2, GetVehicleDriver );
|
|
|
|
InjectHook( 0x53A9A7 + 2, GetVehicleDriver );
|
2018-02-17 13:59:44 +01:00
|
|
|
|
2018-04-22 00:18:12 +02:00
|
|
|
ReadCall( 0x53A990, CPlayerPed::orgDoStuffToGoOnFire );
|
2018-02-17 13:59:44 +01:00
|
|
|
InjectHook( 0x53A990, DoStuffToGoOnFire_NullAndPlayerCheck );
|
|
|
|
|
2018-04-22 00:18:12 +02:00
|
|
|
ReadCall( 0x53A9B7, CFireManager::orgStartFire );
|
2018-02-17 13:59:44 +01:00
|
|
|
InjectHook( 0x53A9B7, &CFireManager::StartFire_NullEntityCheck );
|
|
|
|
}
|
2018-03-28 21:23:16 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Decreased keyboard input latency
|
|
|
|
{
|
|
|
|
using namespace KeyboardInputFix;
|
|
|
|
|
|
|
|
NewKeyState = *(void**)( 0x541E21 + 1 );
|
|
|
|
OldKeyState = *(void**)( 0x541E26 + 1 );
|
|
|
|
TempKeyState = *(void**)( 0x541E32 + 1 );
|
|
|
|
objSize = *(uint32_t*)( 0x541E1C + 1 ) * 4;
|
|
|
|
|
|
|
|
ReadCall( 0x541DEB, orgClearSimButtonPressCheckers );
|
|
|
|
InjectHook( 0x541DEB, ClearSimButtonPressCheckers );
|
|
|
|
Nop( 0x541E2B, 2 );
|
|
|
|
Nop( 0x541E3C, 2 );
|
|
|
|
}
|
2018-04-24 23:59:40 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Fixed handling.cfg name matching (names don't need unique prefixes anymore)
|
|
|
|
{
|
|
|
|
using namespace HandlingNameLoadFix;
|
|
|
|
|
|
|
|
InjectHook( 0x6F4F58, strncpy_Fix );
|
|
|
|
InjectHook( 0x6F4F64, strncmp_Fix );
|
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void Patch_SA_11()
|
|
|
|
{
|
2016-08-10 22:27:58 +02:00
|
|
|
using namespace Memory;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// IsAlreadyRunning needs to be read relatively late - the later, the better
|
|
|
|
int pIsAlreadyRunning = AddressByRegion_11<int>(0x749000);
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( pIsAlreadyRunning, IsAlreadyRunning );
|
2015-04-22 15:20:40 +02:00
|
|
|
InjectHook(pIsAlreadyRunning, InjectDelayedPatches_11);
|
|
|
|
|
2015-06-28 22:17:29 +02:00
|
|
|
// (Hopefully) more precise frame limiter
|
|
|
|
int pAddress = AddressByRegion_11<int>(0x7496A0);
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( pAddress, RsEventHandler );
|
2015-06-28 22:17:29 +02:00
|
|
|
InjectHook(pAddress, NewFrameRender);
|
|
|
|
InjectHook(AddressByRegion_11<int>(0x749624), GetTimeSinceLastFrame);
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// Set CAEDataStream to use a NEW structure
|
|
|
|
CAEDataStream::SetStructType(true);
|
|
|
|
|
|
|
|
// Heli rotors
|
|
|
|
InjectHook(0x6CB390, &CPlane::Render_Stub, PATCH_JUMP);
|
|
|
|
InjectHook(0x6C4C20, &CHeli::Render_Stub, PATCH_JUMP);
|
|
|
|
|
|
|
|
// RefFix
|
|
|
|
static const float fRefZVal = 1.0f;
|
|
|
|
static const float* const pRefFal = &fRefZVal;
|
|
|
|
|
|
|
|
Patch<const void*>(0x6FC1AA, &pRefFal);
|
|
|
|
Patch<BYTE>(0x6FC1D0, 0);
|
|
|
|
|
|
|
|
// Plane rotors
|
|
|
|
InjectHook(0x4C7A01, PlaneAtomicRendererSetup, PATCH_JUMP);
|
|
|
|
|
|
|
|
// DOUBLE_RWHEELS
|
|
|
|
Patch<WORD>(0x4C9490, 0xE281);
|
|
|
|
Patch<int>(0x4C9492, ~(rwMATRIXTYPEMASK|rwMATRIXINTERNALIDENTITY));
|
|
|
|
|
|
|
|
// A fix for DOUBLE_RWHEELS trailers
|
|
|
|
InjectHook(0x4C9423, TrailerDoubleRWheelsFix, PATCH_JUMP);
|
|
|
|
InjectHook(0x4C94F4, TrailerDoubleRWheelsFix2, PATCH_JUMP);
|
|
|
|
|
|
|
|
// No framedelay
|
|
|
|
Patch<WORD>(0x53EDC3, 0x43EB);
|
|
|
|
Patch<BYTE>(0x53EE3F, 0x10);
|
|
|
|
Nop(0x53EE45, 1);
|
|
|
|
|
|
|
|
// Disable re-initialization of DirectInput mouse device by the game
|
|
|
|
Patch<BYTE>(0x57723C, 0xEB);
|
|
|
|
Patch<BYTE>(0x57742A, 0xEB);
|
|
|
|
Patch<BYTE>(0x5774FA, 0xEB);
|
|
|
|
|
|
|
|
// Make sure DirectInput mouse device is set non-exclusive (may not be needed?)
|
|
|
|
Patch<DWORD>(AddressByRegion_11<DWORD>(0x747270), 0x9090C030);
|
|
|
|
|
|
|
|
// Hunter interior & static_rotor for helis
|
|
|
|
InjectHook(0x4C7972, HunterTest, PATCH_JUMP);
|
|
|
|
InjectHook(0x4C9818, CacheCRC32);
|
|
|
|
|
|
|
|
// Moonphases
|
|
|
|
InjectHook(0x7142FB, HandleMoonStuffStub, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Lightbeam fix
|
2017-06-20 20:32:25 +02:00
|
|
|
Nop(0x6A36B5, 3);
|
2015-04-22 15:20:40 +02:00
|
|
|
Patch<WORD>(0x6E1793, 0x0AEB);
|
|
|
|
Patch<WORD>(0x6E17AC, 0x0BEB);
|
|
|
|
Patch<WORD>(0x6E17C5, 0x0BEB);
|
|
|
|
Patch<WORD>(0x6E17DF, 0x1AEB);
|
|
|
|
|
|
|
|
Patch<WORD>(0x6E1C05, 0x09EB);
|
|
|
|
Patch<WORD>(0x6E1C1D, 0x17EB);
|
|
|
|
Patch<WORD>(0x6E1C4F, 0x0AEB);
|
|
|
|
|
|
|
|
Patch<BYTE>(0x6E1810, 0x28);
|
|
|
|
Patch<BYTE>(0x6E1C5D, 0x18);
|
|
|
|
Patch<BYTE>(0x6E180B, 0xC8-0x7C);
|
|
|
|
|
|
|
|
InjectHook(0x6A3717, ResetAlphaFuncRefAfterRender, PATCH_JUMP);
|
|
|
|
|
|
|
|
// PS2 SUN!!!!!!!!!!!!!!!!!
|
|
|
|
Nop(0x6FB9AC, 3);
|
|
|
|
|
|
|
|
// Unlocked widescreen resolutions
|
|
|
|
Patch<DWORD>(0x74619C, 0x9090127D);
|
|
|
|
Nop(0x7461A0, 2);
|
|
|
|
Nop(0x746222, 2);
|
|
|
|
|
|
|
|
if ( *(BYTE*)0x746333 == 0xE9 )
|
|
|
|
{
|
|
|
|
// securom'd EXE
|
|
|
|
// I better check if it's an address I want to patch, I don't want to break the game
|
|
|
|
if ( *(DWORD*)0x14E7387 == 0x00E48C0F )
|
|
|
|
{
|
2017-03-14 21:06:58 +01:00
|
|
|
VP::Patch<DWORD>(0x14E7387, 0x90905D7D);
|
|
|
|
VP::Nop(0x14E738B, 2);
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Sadly, this func is different in 1.01 - so I don't know the original offset
|
|
|
|
}
|
|
|
|
|
|
|
|
// Heap corruption fix
|
|
|
|
Patch<BYTE>(0x4A9D50, 0xC3);
|
|
|
|
|
|
|
|
// User Tracks fix
|
2017-04-12 21:33:23 +02:00
|
|
|
ReadCall( 0x4DA057, SetVolume );
|
2015-04-22 15:20:40 +02:00
|
|
|
InjectHook(0x4DA057, UserTracksFix);
|
|
|
|
InjectHook(0x4DA0A5, 0x4F3430);
|
|
|
|
|
|
|
|
// FLAC support
|
|
|
|
InjectHook(0x57C566, FLACInit);
|
|
|
|
if ( *(BYTE*)0x4F3A50 == 0x6A )
|
|
|
|
{
|
|
|
|
InjectHook(0x4F3A50 + 0x14D, LoadFLAC_11, PATCH_JUMP);
|
|
|
|
InjectHook(0x4F3A50 + 0x197, CAEWaveDecoderInit);
|
|
|
|
|
|
|
|
Patch<WORD>(0x4F3A50 + 0x17A, 0x18EB);
|
|
|
|
Patch<const void*>(0x4F3650 + 0x20, UserTrackExtensions);
|
|
|
|
Patch<const void*>(0x4F3650 + 0x51, &UserTrackExtensions->Codec);
|
|
|
|
Patch<const void*>(0x4F3A10 + 0x37, &UserTrackExtensions[1].Codec);
|
|
|
|
Patch<BYTE>(0x4F3650 + 0x3D, sizeof(UserTrackExtensions));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// securom'd EXE
|
|
|
|
InjectHook(0x5B6B7B, LoadFLAC_11, PATCH_JUMP);
|
|
|
|
InjectHook(0x5B6BFB, CAEWaveDecoderInit, PATCH_JUMP);
|
|
|
|
Patch<WORD>(0x5B6BCB, 0x26EB);
|
|
|
|
|
|
|
|
if ( *(DWORD*)0x14E4954 == 0x05C70A75 )
|
2017-03-14 21:06:58 +01:00
|
|
|
VP::Patch<const void*>(0x14E4958, &UserTrackExtensions[1].Codec);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Deobfuscating an opcode
|
|
|
|
Patch<BYTE>(0x4EBD25, 0xBF);
|
|
|
|
Patch<const void*>(0x4EBD26, UserTrackExtensions);
|
|
|
|
Patch<const void*>(0x4EBDD4, &UserTrackExtensions->Codec);
|
|
|
|
Patch<WORD>(0x4EBD2A, 0x72EB);
|
|
|
|
Patch<BYTE>(0x4EBDC0, sizeof(UserTrackExtensions));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Impound garages working correctly
|
|
|
|
InjectHook(0x4251F9, 0x448A10);
|
|
|
|
InjectHook(0x4253E9, 0x448A10);
|
|
|
|
InjectHook(0x425491, 0x448A10);
|
|
|
|
|
|
|
|
// Impounding after busted works
|
|
|
|
Nop(0x443312, 5);
|
|
|
|
|
|
|
|
// Mouse rotates an airbone car only with Steer with Mouse option enabled
|
|
|
|
bool* bEnableMouseSteering = *(bool**)0x6ADFCD; // CVehicle::m_bEnableMouseSteering
|
|
|
|
Patch<bool*>(0x6B56E0, bEnableMouseSteering);
|
|
|
|
Patch<bool*>(0x6CF047, bEnableMouseSteering);
|
|
|
|
|
|
|
|
// Patched CAutomobile::Fix
|
|
|
|
// misc_x parts don't get reset (Bandito fix), Towtruck's bouncing panel is not reset
|
|
|
|
Patch<WORD>(0x6A3CE9, 0x5EEB);
|
|
|
|
Patch<DWORD>(0x6A3D75, 0x5E5FCF8B);
|
|
|
|
Patch<DWORD>(0x6A3D79, 0x448B5B5D);
|
|
|
|
Patch<DWORD>(0x6A3D7D, 0x89644824);
|
|
|
|
Patch<DWORD>(0x6A3D81, 5);
|
|
|
|
Patch<DWORD>(0x6A3D85, 0x54C48300);
|
|
|
|
InjectHook(0x6A3D89, &CAutomobile::Fix_SilentPatch, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Patched CPlane::Fix
|
|
|
|
// Doors don't get reset (they can't get damaged anyway), bouncing panels DO reset
|
|
|
|
// but not on Vortex
|
|
|
|
Patch<BYTE>(0x6CB3F0, 0xEB);
|
|
|
|
Patch<DWORD>(0x6CB425, 0x5E5FCF8B);
|
|
|
|
InjectHook(0x6CB429, &CPlane::Fix_SilentPatch, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Weapon icon fix (crosshairs mess up rwRENDERSTATEZWRITEENABLE)
|
|
|
|
// Only 1.0 and 1.01, Steam somehow fixed it (not the same way though)
|
|
|
|
Nop(0x58E9E0, 3);
|
|
|
|
Nop(0x58F287, 3);
|
|
|
|
Nop(0x58F2B1, 3);
|
|
|
|
|
|
|
|
// CGarages::RespraysAreFree resetting on new game
|
|
|
|
Patch<WORD>(0x448C58, 0x8966);
|
|
|
|
Patch<BYTE>(0x448C5A, 0x0D);
|
|
|
|
Patch<bool*>(0x448C5B, *(bool**)0x44AD18);
|
|
|
|
Patch<BYTE>(0x448C5F, 0xC3);
|
|
|
|
|
|
|
|
// Bilinear filtering for license plates
|
|
|
|
//Patch<BYTE>(0x6FD528, rwFILTERLINEAR);
|
|
|
|
Patch<BYTE>(0x6FE777, rwFILTERLINEAR);
|
|
|
|
|
|
|
|
// -//- Roadsign maganer
|
|
|
|
//Patch<BYTE>(0x6FE147, rwFILTERLINEAR);
|
|
|
|
|
|
|
|
// Bilinear filtering with mipmaps for weapon icons
|
|
|
|
Patch<BYTE>(0x58DFAA, rwFILTERMIPLINEAR);
|
|
|
|
|
|
|
|
// Illumination value from timecyc.dat properly using floats
|
|
|
|
Patch<WORD>(0x5BC7A9, 0x14EB);
|
|
|
|
|
|
|
|
// Illumination defaults to 1.0
|
|
|
|
Patch<DWORD>(0x5BC2E4, 0xCC2484C7);
|
|
|
|
Patch<DWORD>(0x5BC2E8, 0x00000000);
|
|
|
|
Patch<DWORD>(0x5BC2EC, 0x903F8000);
|
|
|
|
|
|
|
|
// All lights get casted at vehicles
|
|
|
|
Patch<BYTE>(0x5DA297, 8);
|
|
|
|
Patch<BYTE>(0x5DA2A0, 8);
|
|
|
|
Patch<BYTE>(0x5DA73F, 8);
|
|
|
|
|
|
|
|
// 6 extra directionals on Medium and higher
|
2017-12-26 01:59:22 +01:00
|
|
|
// push eax
|
|
|
|
// call GetMaxExtraDirectionals
|
|
|
|
// add esp, 4
|
|
|
|
// mov ebx, eax
|
|
|
|
// nop
|
|
|
|
Patch<uint8_t>( 0x7360B1, 0x50 );
|
|
|
|
InjectHook( 0x7360B1 + 1, GetMaxExtraDirectionals, PATCH_CALL );
|
|
|
|
Patch( 0x7360B1 + 6, { 0x83, 0xC4, 0x04, 0x8B, 0xD8 } );
|
|
|
|
Nop( 0x7360B1 + 11, 3 );
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Default resolution to native resolution
|
|
|
|
RECT desktop;
|
|
|
|
GetWindowRect(GetDesktopWindow(), &desktop);
|
2016-03-31 19:51:14 +02:00
|
|
|
sprintf_s(aNoDesktopMode, "Cannot find %dx%dx32 video mode", desktop.right, desktop.bottom);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
Patch<DWORD>(0x746BE3, desktop.right);
|
|
|
|
Patch<DWORD>(0x746BE8, desktop.bottom);
|
|
|
|
Patch<const char*>(0x746C48, aNoDesktopMode);
|
|
|
|
|
|
|
|
// Corrected Map screen 1px issue
|
|
|
|
Patch<float>(0x576357, -0.5f);
|
|
|
|
Patch<float>(0x576317, -0.5f);
|
|
|
|
Patch<float>(0x57631F, -0.5f);
|
|
|
|
Patch<float>(0x5762CC, -0.5f);
|
|
|
|
Patch<float>(0x57624A, -0.5f);
|
|
|
|
Patch<float>(0x57627C, -0.5f);
|
|
|
|
|
|
|
|
// Cars drive on water cheat
|
|
|
|
Patch<DWORD>(&(*(DWORD**)0x438593)[34], 0xE5FC92C3);
|
|
|
|
|
|
|
|
// No DirectPlay dependency
|
|
|
|
Patch<BYTE>(AddressByRegion_11<DWORD>(0x747E1A), 0xB8);
|
|
|
|
Patch<DWORD>(AddressByRegion_11<DWORD>(0x747E1B), 0x900);
|
|
|
|
|
2015-04-23 17:32:18 +02:00
|
|
|
// SHGetFolderPath on User Files
|
2017-09-18 22:13:02 +02:00
|
|
|
InjectHook(0x7457E0, GetMyDocumentsPathSA, PATCH_JUMP);
|
2015-04-23 17:32:18 +02:00
|
|
|
|
2015-09-20 21:21:36 +02:00
|
|
|
// Fixed muzzleflash not showing from last bullet
|
|
|
|
Nop(0x61F504, 2);
|
|
|
|
|
|
|
|
// Proper randomizations
|
|
|
|
InjectHook(0x44E8AE, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x44ED6E, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x6676C0, Int32Rand); // Prostitutes
|
|
|
|
|
|
|
|
// Help boxes showing with big message
|
|
|
|
// Game seems to assume they can show together
|
|
|
|
Nop(0x58C25F, 6);
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
// Fixed lens flare
|
|
|
|
Patch<DWORD>(0x70FC8A, 0);
|
|
|
|
Patch<BYTE>(0x6FBE51, 0xC3);
|
|
|
|
Patch<BYTE>(0x6FBE30, 0x21);
|
|
|
|
InjectHook(0x6FBE52, 0x70D750, PATCH_CALL);
|
|
|
|
Patch<WORD>(0x6FBE57, 0xDCEB);
|
|
|
|
|
|
|
|
Patch<WORD>(0x6FBCA6, 0xB990);
|
|
|
|
Patch(0x6FBCA8, &FlushLensSwitchZ);
|
|
|
|
Patch<WORD>(0x6FBCB0, 0xD1FF);
|
|
|
|
Nop(0x6FBCB2, 1);
|
|
|
|
|
|
|
|
Patch<WORD>(0x6FB758, 0xB990);
|
|
|
|
Patch(0x6FB75A, &InitBufferSwitchZ);
|
|
|
|
Patch<WORD>(0x6FB762, 0xD1FF);
|
|
|
|
Nop(0x6FB764, 1);
|
|
|
|
|
2016-03-11 23:54:20 +01:00
|
|
|
// Y axis sensitivity fix
|
|
|
|
float* sens = *(float**)0x50F4DC;
|
|
|
|
Patch<const void*>(0x50F4E6 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x50FFC6 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x5110C6 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x5122A8 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x52272C + 0x2, sens);
|
|
|
|
|
2016-03-12 15:47:28 +01:00
|
|
|
// Don't lock mouse Y axis during fadeins
|
|
|
|
Patch<WORD>(0x510054, 0x27EB);
|
|
|
|
Patch<WORD>(0x5109B2, 0xE990);
|
|
|
|
InjectHook(0x524511, 0x5245D9, PATCH_JUMP);
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
// Fixed mirrors crash
|
|
|
|
Patch<uint64_t>(0x7279FB, 0xC604C4833474C085);
|
|
|
|
|
|
|
|
// Mirrors depth fix & bumped quality
|
|
|
|
InjectHook(0x72784D, CreateMirrorBuffers);
|
|
|
|
|
|
|
|
// Fixed MSAA options
|
|
|
|
Patch<BYTE>(0x57D906, 0xEB);
|
|
|
|
Nop(0x57D8C8, 2);
|
|
|
|
|
|
|
|
Patch<BYTE>(AddressByRegion_11<BYTE*>(0x7F759B), 0xEB);
|
|
|
|
Patch<BYTE>(AddressByRegion_11<BYTE*>(0x7F69C6), 0xEB);
|
|
|
|
Patch<WORD>(AddressByRegion_11<BYTE*>(0x7F6F83), 0xE990);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x57D916, orgGetMaxMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x57D916, GetMaxMultiSamplingLevels);
|
|
|
|
InjectHook(0x57D8CA, GetMaxMultiSamplingLevels);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x574A6D, orgChangeMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x574A6D, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x57D942, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x57DA86, ChangeMultiSamplingLevels);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x746BD0, orgSetMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x746BD0, SetMultiSamplingLevels);
|
|
|
|
|
|
|
|
Nop(0x57A66C, 1);
|
|
|
|
InjectHook(0x57A66D, MSAAText, PATCH_CALL);
|
|
|
|
|
|
|
|
// Fixed car collisions - car you're hitting gets proper damage now
|
|
|
|
InjectHook(0x542D8A, FixedCarDamage, PATCH_CALL);
|
|
|
|
|
2016-05-28 22:44:33 +02:00
|
|
|
|
|
|
|
// Car explosion crash with multimonitor
|
|
|
|
// Unitialized collision data breaking stencil shadows
|
|
|
|
// FUCK THIS IN 1.01
|
|
|
|
|
|
|
|
// Fixed escalators crash
|
|
|
|
// FUCK THIS IN 1.01
|
|
|
|
|
|
|
|
|
|
|
|
// Don't allocate constant memory for stencil shadows every frame
|
|
|
|
// FUCK THIS IN 1.01
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// Fixed police scanner names
|
|
|
|
char* pScannerNames = *(char**)0x4E7714;
|
2017-04-09 20:25:19 +02:00
|
|
|
strcpy_s(pScannerNames + (8*113), 8, "WESTP");
|
|
|
|
strcpy_s(pScannerNames + (8*134), 8, "????");
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
|
|
|
|
// 1.01 ONLY
|
|
|
|
// I'm not sure what was this new audio code supposed to do, but it leaks memory
|
|
|
|
// and due to this I have to make extra effort if I want FLAC to work on 1.01
|
|
|
|
Patch<DWORD>(0x4E124C, 0x4DEBC78B);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Patch_SA_Steam()
|
|
|
|
{
|
2016-08-10 22:27:58 +02:00
|
|
|
using namespace Memory;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// IsAlreadyRunning needs to be read relatively late - the later, the better
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x7826ED, IsAlreadyRunning );
|
2015-04-22 15:20:40 +02:00
|
|
|
InjectHook(0x7826ED, InjectDelayedPatches_Steam);
|
|
|
|
|
2015-06-28 22:17:29 +02:00
|
|
|
// (Hopefully) more precise frame limiter
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x782D25, RsEventHandler );
|
|
|
|
InjectHook(0x782D25, NewFrameRender);
|
2015-06-28 22:17:29 +02:00
|
|
|
InjectHook(0x782CA8, GetTimeSinceLastFrame);
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// Set CAEDataStream to use an old structure
|
|
|
|
CAEDataStream::SetStructType(false);
|
|
|
|
|
|
|
|
// Heli rotors
|
|
|
|
InjectHook(0x700620, &CPlane::Render_Stub, PATCH_JUMP);
|
|
|
|
InjectHook(0x6F9550, &CHeli::Render_Stub, PATCH_JUMP);
|
|
|
|
|
|
|
|
// RefFix
|
|
|
|
static const float fRefZVal = 1.0f;
|
|
|
|
static const float* const pRefFal = &fRefZVal;
|
|
|
|
|
|
|
|
Patch<const void*>(0x733FF0, &pRefFal);
|
|
|
|
Patch<BYTE>(0x73401A, 0);
|
|
|
|
|
|
|
|
// Plane rotors
|
|
|
|
InjectHook(0x4D2270, PlaneAtomicRendererSetup, PATCH_JUMP);
|
|
|
|
|
|
|
|
// DOUBLE_RWHEELS
|
|
|
|
Patch<WORD>(0x4D3B9D, 0x6781);
|
|
|
|
Patch<int>(0x4D3BA0, ~(rwMATRIXTYPEMASK|rwMATRIXINTERNALIDENTITY));
|
|
|
|
|
|
|
|
// A fix for DOUBLE_RWHEELS trailers
|
|
|
|
InjectHook(0x4D3B47, TrailerDoubleRWheelsFix_Steam, PATCH_JUMP);
|
|
|
|
InjectHook(0x4D3C1A, TrailerDoubleRWheelsFix2_Steam, PATCH_JUMP);
|
|
|
|
|
|
|
|
// No framedelay
|
|
|
|
Patch<WORD>(0x551113, 0x46EB);
|
|
|
|
Patch<BYTE>(0x551195, 0xC);
|
|
|
|
Nop(0x551197, 1);
|
|
|
|
|
|
|
|
// Disable re-initialization of DirectInput mouse device by the game
|
|
|
|
Patch<BYTE>(0x58C0E5, 0xEB);
|
|
|
|
Patch<BYTE>(0x58C2CF, 0xEB);
|
|
|
|
Patch<BYTE>(0x58C3B3, 0xEB);
|
|
|
|
|
|
|
|
// Make sure DirectInput mouse device is set non-exclusive (may not be needed?)
|
|
|
|
Patch<DWORD>(0x7807D0, 0x9090C030);
|
|
|
|
|
|
|
|
// Hunter interior & static_rotor for helis
|
|
|
|
InjectHook(0x4D21E1, HunterTest, PATCH_JUMP);
|
|
|
|
InjectHook(0x4D3F1D, CacheCRC32);
|
|
|
|
|
|
|
|
// Bindable NUM5
|
|
|
|
// Only 1.0 and Steam
|
|
|
|
Nop(0x59363B, 2);
|
|
|
|
|
|
|
|
// Moonphases
|
|
|
|
InjectHook(0x72F058, HandleMoonStuffStub_Steam, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Lightbeam fix
|
|
|
|
Patch<WORD>(0x6CFEF9, 0x10EB);
|
|
|
|
Nop(0x6CFF0F, 3);
|
|
|
|
Patch<WORD>(0x71D1F5, 0x0DEB);
|
|
|
|
Patch<WORD>(0x71D213, 0x0CEB);
|
|
|
|
Patch<WORD>(0x71D230, 0x0DEB);
|
|
|
|
Patch<WORD>(0x71D24D, 0x1FEB);
|
|
|
|
|
|
|
|
Patch<WORD>(0x71D72F, 0x0BEB);
|
|
|
|
Patch<WORD>(0x71D74B, 0x1BEB);
|
|
|
|
Patch<WORD>(0x71D785, 0x0CEB);
|
|
|
|
|
|
|
|
Patch<BYTE>(0x71D284, 0x28);
|
|
|
|
Patch<BYTE>(0x71D795, 0x18);
|
|
|
|
Patch<BYTE>(0x71D27F, 0xD0-0x9C);
|
|
|
|
//InjectHook(0x6A2EDA, CullTest);
|
|
|
|
|
|
|
|
InjectHook(0x6CFF69, ResetAlphaFuncRefAfterRender_Steam, PATCH_JUMP);
|
|
|
|
|
|
|
|
// PS2 SUN!!!!!!!!!!!!!!!!!
|
|
|
|
Nop(0x73362F, 2);
|
|
|
|
|
|
|
|
// Unlocked widescreen resolutions
|
|
|
|
//Patch<WORD>(0x77F9F0, 0x6E7D);
|
|
|
|
Patch<WORD>(0x77F9FC, 0x627D);
|
|
|
|
Patch<DWORD>(0x77F80B, 0x9090127D);
|
|
|
|
Nop(0x77F80F, 2);
|
|
|
|
Nop(0x77F880, 2);
|
|
|
|
|
|
|
|
// Heap corruption fix
|
|
|
|
Nop(0x5D88AE, 5);
|
|
|
|
|
|
|
|
// User Tracks fix
|
2017-04-12 21:33:23 +02:00
|
|
|
SetVolume = reinterpret_cast<decltype(SetVolume)>(0x4E2750);
|
2015-04-22 15:20:40 +02:00
|
|
|
Patch<BYTE>(0x4E4A28, 0xBA);
|
|
|
|
Patch<const void*>(0x4E4A29, UserTracksFix_Steam);
|
|
|
|
InjectHook(0x4E4A8B, 0x4FF2B0);
|
|
|
|
|
|
|
|
// FLAC support
|
|
|
|
InjectHook(0x4FFC39, LoadFLAC_Steam, PATCH_JUMP);
|
|
|
|
InjectHook(0x591814, FLACInit_Steam);
|
|
|
|
InjectHook(0x4FFC83, CAEWaveDecoderInit);
|
|
|
|
|
|
|
|
Patch<WORD>(0x4FFC66, 0x18EB);
|
|
|
|
Patch<const void*>(0x4FF4F0, UserTrackExtensions);
|
|
|
|
Patch<const void*>(0x4FF523, &UserTrackExtensions->Codec);
|
|
|
|
Patch<const void*>(0x4FFAB6, &UserTrackExtensions[1].Codec);
|
|
|
|
Patch<BYTE>(0x4FF50F, sizeof(UserTrackExtensions));
|
|
|
|
|
|
|
|
// Impound garages working correctly
|
|
|
|
InjectHook(0x426B48, 0x44C950);
|
|
|
|
InjectHook(0x426D16, 0x44C950);
|
|
|
|
InjectHook(0x426DC5, 0x44C950);
|
|
|
|
|
|
|
|
// Impounding after busted works
|
|
|
|
Nop(0x446F58, 5);
|
|
|
|
|
|
|
|
// Mouse rotates an airbone car only with Steer with Mouse option enabled
|
|
|
|
bool* bEnableMouseSteering = *(bool**)0x6DB76D; // CVehicle::m_bEnableMouseSteering
|
|
|
|
Patch<bool*>(0x6E3199, bEnableMouseSteering);
|
|
|
|
Patch<bool*>(0x7046AB, bEnableMouseSteering);
|
|
|
|
|
|
|
|
// Patched CAutomobile::Fix
|
|
|
|
// misc_x parts don't get reset (Bandito fix), Towtruck's bouncing panel is not reset
|
|
|
|
Patch<DWORD>(0x6D05B3, 0x6BEBED31);
|
|
|
|
Patch<DWORD>(0x6D0649, 0x5E5FCF8B);
|
|
|
|
Patch<DWORD>(0x6D064D, 0x448B5B5D);
|
|
|
|
Patch<DWORD>(0x6D0651, 0x89644824);
|
|
|
|
Patch<DWORD>(0x6D0655, 5);
|
|
|
|
Patch<DWORD>(0x6D0659, 0x54C48300);
|
|
|
|
InjectHook(0x6D065D, &CAutomobile::Fix_SilentPatch, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Patched CPlane::Fix
|
|
|
|
// Doors don't get reset (they can't get damaged anyway), bouncing panels DO reset
|
|
|
|
// but not on Vortex
|
|
|
|
Patch<BYTE>(0x700681, 0xEB);
|
|
|
|
Patch<DWORD>(0x7006B6, 0x5E5FCF8B);
|
|
|
|
InjectHook(0x7006BA, &CPlane::Fix_SilentPatch, PATCH_JUMP);
|
|
|
|
|
|
|
|
// Zones fix
|
2017-03-11 15:43:55 +01:00
|
|
|
InjectHook(0x587080, GetCurrentZoneLockedOrUnlocked_Steam, PATCH_JUMP);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// CGarages::RespraysAreFree resetting on new game
|
|
|
|
Patch<WORD>(0x44CB55, 0xC766);
|
|
|
|
Patch<BYTE>(0x44CB57, 0x05);
|
|
|
|
Patch<bool*>(0x44CB58, *(bool**)0x44EEBA);
|
|
|
|
Patch<WORD>(0x44CB5C, 0x0000);
|
|
|
|
|
|
|
|
// Bilinear filtering for license plates
|
|
|
|
//Patch<BYTE>(0x6FD528, rwFILTERLINEAR);
|
|
|
|
Patch<BYTE>(0x736B30, rwFILTERLINEAR);
|
|
|
|
|
|
|
|
// -//- Roadsign maganer
|
|
|
|
//Patch<BYTE>(0x6FE147, rwFILTERLINEAR);
|
|
|
|
|
|
|
|
// Bilinear filtering with mipmaps for weapon icons
|
|
|
|
Patch<BYTE>(0x59BD9C, rwFILTERMIPLINEAR);
|
|
|
|
|
|
|
|
// Illumination value from timecyc.dat properly using floats
|
|
|
|
Patch<WORD>(0x5DAF6B, 0x2CEB);
|
|
|
|
|
|
|
|
// Illumination defaults to 1.0
|
|
|
|
Patch<DWORD>(0x5DA8D4, 0xD82484C7);
|
|
|
|
Patch<DWORD>(0x5DA8D8, 0x00000000);
|
|
|
|
Patch<DWORD>(0x5DA8DC, 0x903F8000);
|
|
|
|
|
|
|
|
// All lights get casted at vehicles
|
|
|
|
Patch<BYTE>(0x5F61C7, 8);
|
|
|
|
Patch<BYTE>(0x5F61D0, 8);
|
|
|
|
Patch<BYTE>(0x5F666D, 8);
|
|
|
|
|
|
|
|
// 6 extra directionals on Medium and higher
|
2017-12-26 01:59:22 +01:00
|
|
|
// push dword ptr [CGame::currArea]
|
|
|
|
// call GetMaxExtraDirectionals
|
|
|
|
// add esp, 4
|
|
|
|
// mov ebx, eax
|
|
|
|
// nop
|
|
|
|
Patch( 0x768046, { 0xFF, 0x35 } );
|
|
|
|
InjectHook( 0x768046 + 6, GetMaxExtraDirectionals, PATCH_CALL );
|
|
|
|
Patch( 0x768046 + 11, { 0x83, 0xC4, 0x04, 0x8B, 0xD8 } );
|
|
|
|
Nop( 0x768046 + 16, 1 );
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Default resolution to native resolution
|
|
|
|
RECT desktop;
|
|
|
|
GetWindowRect(GetDesktopWindow(), &desktop);
|
2016-03-31 19:51:14 +02:00
|
|
|
sprintf_s(aNoDesktopMode, "Cannot find %dx%dx32 video mode", desktop.right, desktop.bottom);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
Patch<DWORD>(0x780219, desktop.right);
|
|
|
|
Patch<DWORD>(0x78021E, desktop.bottom);
|
|
|
|
Patch<const char*>(0x78027E, aNoDesktopMode);
|
|
|
|
|
|
|
|
// Corrected Map screen 1px issue
|
|
|
|
/*Patch<float>(0x575DE7, -5.0f);
|
|
|
|
Patch<float>(0x575DA7, -5.0f);
|
|
|
|
Patch<float>(0x575DAF, -5.0f);
|
|
|
|
Patch<float>(0x575D5C, -5.0f);
|
|
|
|
Patch<float>(0x575CDA, -5.0f);
|
|
|
|
Patch<float>(0x575D0C, -5.0f);*/
|
|
|
|
InjectHook(0x58B0F8, DrawRect_HalfPixel_Steam<true,false,false,true>);
|
|
|
|
InjectHook(0x58B146, DrawRect_HalfPixel_Steam<true,false,false,false>);
|
|
|
|
InjectHook(0x58B193, DrawRect_HalfPixel_Steam<true,false,false,true>);
|
|
|
|
InjectHook(0x58B1E1, DrawRect_HalfPixel_Steam<false,false,false,true>);
|
|
|
|
|
|
|
|
// Cars drive on water cheat
|
|
|
|
Patch<DWORD>(&(*(DWORD**)0x43B793)[34], 0xE5FC92C3);
|
|
|
|
|
|
|
|
// No DirectPlay dependency
|
|
|
|
Patch<BYTE>(0x781456, 0xB8);
|
|
|
|
Patch<DWORD>(0x781457, 0x900);
|
|
|
|
|
2015-04-23 17:32:18 +02:00
|
|
|
// SHGetFolderPath on User Files
|
2017-09-18 22:13:02 +02:00
|
|
|
InjectHook(0x77EDC0, GetMyDocumentsPathSA, PATCH_JUMP);
|
2015-04-23 17:32:18 +02:00
|
|
|
|
2015-09-20 21:21:36 +02:00
|
|
|
// Fixed muzzleflash not showing from last bullet
|
|
|
|
Nop(0x61F504, 2);
|
|
|
|
|
|
|
|
// Proper randomizations
|
|
|
|
InjectHook(0x452CCF, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x45322C, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x690263, Int32Rand); // Prostitutes
|
|
|
|
|
|
|
|
// Help boxes showing with big message
|
|
|
|
// Game seems to assume they can show together
|
|
|
|
Nop(0x599CD3, 6);
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
// Fixed lens flare
|
|
|
|
Nop(0x733C65, 5);
|
|
|
|
Patch<BYTE>(0x733C4E, 0x26);
|
|
|
|
InjectHook(0x733C75, 0x7591E0, PATCH_CALL);
|
|
|
|
Patch<WORD>(0x733C7A, 0xDBEB);
|
|
|
|
|
|
|
|
Nop(0x733A5A, 4);
|
|
|
|
Patch<BYTE>(0x733A5E, 0xB8);
|
|
|
|
Patch(0x733A5F, &FlushLensSwitchZ);
|
|
|
|
|
|
|
|
Patch<DWORD>(0x7333B0, 0xB9909090);
|
|
|
|
Patch(0x7333B4, &InitBufferSwitchZ);
|
|
|
|
|
2016-03-11 23:54:20 +01:00
|
|
|
// Y axis sensitivity fix
|
|
|
|
float* sens = *(float**)0x51D4FA;
|
|
|
|
Patch<const void*>(0x51D508 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x51E25A + 0x2, sens);
|
|
|
|
Patch<const void*>(0x51F459 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x52086A + 0x2, sens);
|
|
|
|
Patch<const void*>(0x532B9B + 0x2, sens);
|
|
|
|
|
2016-03-12 15:47:28 +01:00
|
|
|
// Don't lock mouse Y axis during fadeins
|
|
|
|
Patch<WORD>(0x51E192, 0x2BEB);
|
|
|
|
Patch<WORD>(0x51ED38, 0xE990);
|
|
|
|
InjectHook(0x534D3E, 0x534DF7, PATCH_JUMP);
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
// Fixed mirrors crash
|
|
|
|
Patch<uint64_t>(0x75903A, 0xC604C4833474C085);
|
|
|
|
|
|
|
|
// Mirrors depth fix & bumped quality
|
|
|
|
InjectHook(0x758E91, CreateMirrorBuffers);
|
|
|
|
|
|
|
|
// Fixed MSAA options
|
|
|
|
Patch<BYTE>(0x592BBB, 0xEB);
|
|
|
|
Nop(0x592B7F, 2);
|
|
|
|
|
|
|
|
Patch<BYTE>(0x830C5B, 0xEB);
|
|
|
|
Patch<BYTE>(0x830086, 0xEB);
|
|
|
|
Patch<WORD>(0x830643, 0xE990);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x592BCF, orgGetMaxMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x592BCF, GetMaxMultiSamplingLevels);
|
|
|
|
InjectHook(0x592B81, GetMaxMultiSamplingLevels);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x5897CD, orgChangeMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x5897CD, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x592BFB, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x592D2E, ChangeMultiSamplingLevels);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x780206, orgSetMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x780206, SetMultiSamplingLevels);
|
|
|
|
|
|
|
|
Patch<WORD>(0x58F88C, 0xBA90);
|
|
|
|
Patch(0x58F88E, MSAAText);
|
|
|
|
|
|
|
|
// Fixed car collisions - car you're hitting gets proper damage now
|
|
|
|
Nop(0x555AB8, 2);
|
|
|
|
InjectHook(0x555AC0, FixedCarDamage_Steam, PATCH_CALL);
|
|
|
|
|
2016-05-28 22:44:33 +02:00
|
|
|
|
|
|
|
// Car explosion crash with multimonitor
|
|
|
|
// Unitialized collision data breaking stencil shadows
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x41A216, orgMemMgrMalloc );
|
2016-05-28 22:44:33 +02:00
|
|
|
InjectHook(0x41A216, CollisionData_MallocAndInit);
|
|
|
|
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x41A07C, orgNewAlloc );
|
2016-05-28 22:44:33 +02:00
|
|
|
InjectHook(0x41A07C, CollisionData_NewAndInit);
|
|
|
|
InjectHook(0x41A159, CollisionData_NewAndInit);
|
|
|
|
|
|
|
|
|
|
|
|
// Crash when entering advanced display options on a dual monitor machine after:
|
|
|
|
// - starting game on primary monitor in maximum resolution, exiting,
|
|
|
|
// starting again in maximum resolution on secondary monitor.
|
|
|
|
// Secondary monitor maximum resolution had to be greater than maximum resolution of primary monitor.
|
|
|
|
// Not in 1.01
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x77F99E, orgGetNumVideoModes );
|
2016-05-28 22:44:33 +02:00
|
|
|
InjectHook(0x77F99E, GetNumVideoModes_Store);
|
|
|
|
InjectHook(0x77F901, GetNumVideoModes_Retrieve);
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed escalators crash
|
2016-09-12 00:09:21 +02:00
|
|
|
ReadCall( 0x739975, orgEscalatorsUpdate );
|
2016-05-28 22:44:33 +02:00
|
|
|
InjectHook(0x739975, UpdateEscalators);
|
|
|
|
InjectHook(0x738BBD, &CEscalator::SwitchOffNoRemove);
|
|
|
|
|
|
|
|
|
|
|
|
// Don't allocate constant memory for stencil shadows every frame
|
|
|
|
InjectHook(0x760795, StencilShadowAlloc, PATCH_CALL);
|
|
|
|
Nop(0x7607CD, 3);
|
|
|
|
Patch<WORD>(0x76079A, 0x2CEB);
|
|
|
|
Patch<DWORD>(0x76082C, 0x90C35D5F); // pop edi, pop ebp, ret
|
|
|
|
|
|
|
|
|
2016-07-26 20:12:56 +02:00
|
|
|
// "Streaming memory bug" fix
|
|
|
|
InjectHook(0x4CF9E8, GTARtAnimInterpolatorSetCurrentAnim);
|
|
|
|
|
|
|
|
|
2016-07-27 02:00:18 +02:00
|
|
|
// Fixed ammo for melee weapons in cheats
|
|
|
|
Patch<BYTE>(0x43BB8B+1, 1); // knife
|
|
|
|
Patch<BYTE>(0x43BC78+1, 1); // knife
|
|
|
|
Patch<BYTE>(0x43BE1F+1, 1); // chainsaw
|
|
|
|
Patch<BYTE>(0x43BED8+1, 1); // chainsaw
|
|
|
|
Patch<BYTE>(0x43C868+1, 1); // parachute
|
|
|
|
|
|
|
|
Patch<BYTE>(0x43D24C, 0x53); // katana
|
|
|
|
Patch<WORD>(0x43D24D, 0x016A);
|
|
|
|
|
|
|
|
|
2017-03-05 23:05:02 +01:00
|
|
|
// AI accuracy issue
|
|
|
|
Nop(0x7738F5, 1);
|
|
|
|
InjectHook( 0x7738F5+1, WeaponRangeMult_VehicleCheck, PATCH_CALL );
|
|
|
|
|
|
|
|
|
2017-03-07 00:40:37 +01:00
|
|
|
// Don't catch WM_SYSKEYDOWN and WM_SYSKEYUP (fixes Alt+F4)
|
|
|
|
InjectHook( 0x7821E5, 0x7823FE, PATCH_JUMP );
|
|
|
|
Patch<uint8_t>( 0x7821A7 + 1, 0x5C ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( 0x7821AF, 0x53 ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( 0x7821D1 + 1, 0xFB ); // esi -> ebx
|
|
|
|
Patch<int8_t>( 0x7821B1 + 3, 0x54-0x2C ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( 0x7821C2 + 3, 0x4C-0x2C ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( 0x7821D6 + 3, 0x4C-0x2C ); // use stack space for new lParam
|
|
|
|
|
|
|
|
InjectHook( 0x78222F, 0x7823FE, PATCH_JUMP );
|
|
|
|
Patch<uint8_t>( 0x7821F1 + 1, 0x5C ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( 0x7821F9, 0x53 ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( 0x78221B + 1, 0xFB ); // esi -> ebx
|
|
|
|
Patch<int8_t>( 0x7821FB + 3, 0x54-0x2C ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( 0x78220C + 3, 0x4C-0x2C ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( 0x782220 + 3, 0x4C-0x2C ); // use stack space for new lParam
|
|
|
|
|
|
|
|
|
2017-03-10 16:19:05 +01:00
|
|
|
// Reinit CCarCtrl fields (firetruck and ambulance generation)
|
|
|
|
ReadCall( 0x54DCCB, orgCarCtrlReInit );
|
|
|
|
InjectHook(0x54DCCB, CarCtrlReInit_SilentPatch);
|
|
|
|
|
|
|
|
|
2017-03-10 23:54:04 +01:00
|
|
|
// FuckCarCompletely not fixing panels
|
|
|
|
Nop(0x6F5EC1, 3);
|
|
|
|
|
|
|
|
|
2017-03-11 18:48:04 +01:00
|
|
|
// 014C cargen counter fix (by spaceeinstein)
|
|
|
|
Patch<uint8_t>( 0x6F566D + 1, 0xBF ); // movzx eax, word ptr [ebp+1Ah] -> movsx eax, word ptr [ebp+1Ah]
|
|
|
|
Patch<uint8_t>( 0x6F567E + 1, 0xBF ); // movzx ecx, ax -> movsx ecx, ax
|
|
|
|
Patch<uint8_t>( 0x6F3E32, 0x74 ); // jge -> jz
|
|
|
|
|
|
|
|
|
2017-03-20 22:52:41 +01:00
|
|
|
// Linear filtering on script sprites
|
|
|
|
ReadCall( 0x59A3F2, orgDrawScriptSpritesAndRectangles );
|
|
|
|
InjectHook( 0x59A3F2, DrawScriptSpritesAndRectangles );
|
|
|
|
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// Fixed police scanner names
|
|
|
|
char* pScannerNames = *(char**)0x4F2B83;
|
2017-04-09 20:25:19 +02:00
|
|
|
strcpy_s(pScannerNames + (8*113), 8, "WESTP");
|
|
|
|
strcpy_s(pScannerNames + (8*134), 8, "????");
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// STEAM ONLY
|
|
|
|
// Proper aspect ratios - why Rockstar, why?
|
|
|
|
// Steam aspect ratios were additionally divided by 1.1, producing a squashed image
|
|
|
|
static const float f43 = 4.0f/3.0f, f54 = 5.0f/4.0f, f169 = 16.0f/9.0f;
|
|
|
|
Patch<const void*>(0x73822B, &f169);
|
|
|
|
Patch<const void*>(0x738247, &f54);
|
|
|
|
Patch<const void*>(0x73825A, &f43);
|
|
|
|
|
|
|
|
// No IMG size check
|
|
|
|
Nop(0x406CD0, 7);
|
|
|
|
Nop(0x406D00, 7);
|
|
|
|
|
|
|
|
// Unlock 1.0/1.01 saves loading
|
|
|
|
InjectHook(0x5EDFD9, 0x5EE0FA, PATCH_JUMP);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Patch_SA_NewSteam_r1()
|
|
|
|
{
|
2016-08-10 22:27:58 +02:00
|
|
|
using namespace Memory::DynBase;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
// Nazi EXE?
|
|
|
|
if ( *(DWORD*)DynBaseAddress(0x49F810) == 0x64EC8B55 )
|
|
|
|
{
|
|
|
|
// Regular
|
|
|
|
|
|
|
|
// No framedelay
|
|
|
|
InjectHook(0x54ECC6, DynBaseAddress(0x54ED0C), PATCH_JUMP);
|
|
|
|
Patch<BYTE>(0x54ED45, 0x4);
|
|
|
|
Nop(0x54ED47, 1);
|
|
|
|
|
|
|
|
// Unlock 1.0/1.01 saves loading
|
|
|
|
Patch<WORD>(0x5ED3E9, 0xE990);
|
|
|
|
|
|
|
|
// Old .set files working again
|
|
|
|
static const DWORD dwSetVersion = 6;
|
|
|
|
Patch<const void*>(0x59058A, &dwSetVersion);
|
|
|
|
Patch<BYTE>(0x59086D, 6);
|
|
|
|
Patch<BYTE>(0x53EC4A, 6);
|
|
|
|
|
|
|
|
// Disable re-initialization of DirectInput mouse device by the game
|
|
|
|
Patch<BYTE>(0x58A891, 0xEB);
|
|
|
|
Patch<BYTE>(0x58AA77, 0xEB);
|
|
|
|
Patch<BYTE>(0x58AB59, 0xEB);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Nazi
|
|
|
|
|
|
|
|
// No framedelay
|
|
|
|
InjectHook(0x54EC06, DynBaseAddress(0x54EC4C), PATCH_JUMP);
|
|
|
|
Patch<BYTE>(0x54EC85, 0x4);
|
|
|
|
Nop(0x54EC87, 1);
|
|
|
|
|
|
|
|
// Unlock 1.0/1.01 saves loading
|
|
|
|
Patch<WORD>(0x5ED349, 0xE990);
|
|
|
|
|
|
|
|
// Old .set files working again
|
|
|
|
static const DWORD dwSetVersion = 6;
|
|
|
|
Patch<const void*>(0x5904DA, &dwSetVersion);
|
|
|
|
Patch<BYTE>(0x5907BD, 6);
|
|
|
|
Patch<BYTE>(0x53EB9A, 6);
|
|
|
|
|
|
|
|
// Disable re-initialization of DirectInput mouse device by the game
|
|
|
|
Patch<BYTE>(0x58A7D1, 0xEB);
|
|
|
|
Patch<BYTE>(0x58A9B7, 0xEB);
|
|
|
|
Patch<BYTE>(0x58AA99, 0xEB);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Unlocked widescreen resolutions
|
|
|
|
//Patch<WORD>(0x779BAD, 0x607D);
|
|
|
|
Patch<WORD>(0x779BB8, 0x557D);
|
|
|
|
Patch<DWORD>(0x7799D8, 0x9090117D);
|
|
|
|
Nop(0x779A45, 2);
|
|
|
|
Nop(0x7799DC, 2);
|
|
|
|
|
|
|
|
// Make sure DirectInput mouse device is set non-exclusive (may not be needed?)
|
|
|
|
Nop(0x77AB3F, 1);
|
|
|
|
Patch<WORD>(0x77AB40, 0x01B0);
|
|
|
|
|
|
|
|
// Default resolution to native resolution
|
|
|
|
RECT desktop;
|
|
|
|
GetWindowRect(GetDesktopWindow(), &desktop);
|
2016-03-31 19:51:14 +02:00
|
|
|
sprintf_s(aNoDesktopMode, "Cannot find %dx%dx32 video mode", desktop.right, desktop.bottom);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
Patch<DWORD>(0x77A3EF, desktop.right);
|
|
|
|
Patch<DWORD>(0x77A3F4, desktop.bottom);
|
|
|
|
Patch<const char*>(0x77A44B, aNoDesktopMode);
|
|
|
|
|
|
|
|
|
|
|
|
// Proper aspect ratios
|
|
|
|
static const float f43 = 4.0f/3.0f, f54 = 5.0f/4.0f, f169 = 16.0f/9.0f;
|
|
|
|
Patch<const void*>(0x73424B, &f169);
|
|
|
|
Patch<const void*>(0x734267, &f54);
|
|
|
|
Patch<const void*>(0x73427A, &f43);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Patch_SA_NewSteam_r2()
|
|
|
|
{
|
2016-08-10 22:27:58 +02:00
|
|
|
using namespace Memory::DynBase;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2015-06-28 22:17:29 +02:00
|
|
|
// (Hopefully) more precise frame limiter
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x77D55F, RsEventHandler );
|
2015-06-28 22:17:29 +02:00
|
|
|
InjectHook(0x77D55F, NewFrameRender);
|
|
|
|
InjectHook(0x77D4E8, GetTimeSinceLastFrame);
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// No framedelay
|
|
|
|
InjectHook(0x54ECC6, DynBaseAddress(0x54ED0C), PATCH_JUMP);
|
|
|
|
Patch<BYTE>(0x54ED45, 0x4);
|
|
|
|
Nop(0x54ED47, 1);
|
|
|
|
|
|
|
|
// Unlock 1.0/1.01 saves loading
|
|
|
|
Patch<WORD>(0x5ED349, 0xE990);
|
|
|
|
|
|
|
|
// Old .set files working again
|
|
|
|
static const DWORD dwSetVersion = 6;
|
|
|
|
Patch<const void*>(0x5904CA, &dwSetVersion);
|
|
|
|
Patch<BYTE>(0x5907AD, 6);
|
|
|
|
Patch<BYTE>(0x53EC4A, 6);
|
|
|
|
|
|
|
|
// Disable re-initialization of DirectInput mouse device by the game
|
|
|
|
Patch<BYTE>(0x58A881, 0xEB);
|
|
|
|
Patch<BYTE>(0x58AA67, 0xEB);
|
|
|
|
Patch<BYTE>(0x58AB49, 0xEB);
|
|
|
|
|
|
|
|
// Unlocked widescreen resolutions
|
|
|
|
//Patch<WORD>(0x779BAD, 0x607D);
|
|
|
|
Patch<WORD>(0x779BC8, 0x697D);
|
|
|
|
Patch<DWORD>(0x7799D8, 0x9090117D);
|
|
|
|
Nop(0x779A56, 2);
|
|
|
|
Nop(0x7799DC, 2);
|
|
|
|
|
|
|
|
// Make sure DirectInput mouse device is set non-exclusive (may not be needed?)
|
|
|
|
Nop(0x77AB6F, 1);
|
|
|
|
Patch<WORD>(0x77AB70, 0x01B0);
|
|
|
|
|
|
|
|
// Default resolution to native resolution
|
|
|
|
RECT desktop;
|
|
|
|
GetWindowRect(GetDesktopWindow(), &desktop);
|
2016-03-31 19:51:14 +02:00
|
|
|
sprintf_s(aNoDesktopMode, "Cannot find %dx%dx32 video mode", desktop.right, desktop.bottom);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
Patch<DWORD>(0x77A41F, desktop.right);
|
|
|
|
Patch<DWORD>(0x77A424, desktop.bottom);
|
|
|
|
Patch<const char*>(0x77A47B, aNoDesktopMode);
|
|
|
|
|
|
|
|
// No DirectPlay dependency
|
|
|
|
Patch<BYTE>(0x77B46E, 0xB8);
|
|
|
|
Patch<DWORD>(0x77B46F, 0x900);
|
|
|
|
|
2015-04-23 17:32:18 +02:00
|
|
|
// SHGetFolderPath on User Files
|
2017-09-18 22:13:02 +02:00
|
|
|
InjectHook(0x778FA0, GetMyDocumentsPathSA, PATCH_JUMP);
|
2015-04-23 17:32:18 +02:00
|
|
|
|
2015-09-20 21:21:36 +02:00
|
|
|
// Fixed muzzleflash not showing from last bullet
|
|
|
|
Nop(0x63E8A9, 2);
|
|
|
|
|
|
|
|
// Proper randomizations
|
|
|
|
InjectHook(0x45234C, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x45284C, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x69046F, Int32Rand); // Prostitutes
|
|
|
|
|
|
|
|
// Help boxes showing with big message
|
|
|
|
// Game seems to assume they can show together
|
|
|
|
Nop(0x597EEA, 6);
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
// Fixed lens flare
|
|
|
|
Nop(0x7300F8, 5);
|
|
|
|
Patch<BYTE>(0x7300E3, 0x20);
|
|
|
|
InjectHook(0x730104, DynBaseAddress(0x753AE0), PATCH_CALL);
|
|
|
|
Patch<WORD>(0x730109, 0xE1EB);
|
|
|
|
|
|
|
|
Nop(0x72FF17, 4);
|
|
|
|
Patch<BYTE>(0x72FF1B, 0xB8);
|
|
|
|
Patch(0x72FF1C, &FlushLensSwitchZ);
|
|
|
|
|
|
|
|
Patch<DWORD>(0x72F91D, 0xB9909090);
|
|
|
|
Patch(0x72F921, &InitBufferSwitchZ);
|
|
|
|
|
2016-03-11 23:54:20 +01:00
|
|
|
// Y axis sensitivity fix
|
|
|
|
float* sens = *(float**)DynBaseAddress(0x51B987);
|
|
|
|
Patch<const void*>(0x51B993 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x51C68C + 0x2, sens);
|
|
|
|
Patch<const void*>(0x51D73A + 0x2, sens);
|
|
|
|
Patch<const void*>(0x51EA3A + 0x2, sens);
|
|
|
|
Patch<const void*>(0x52FBE1 + 0x2, sens);
|
|
|
|
|
2016-03-12 15:47:28 +01:00
|
|
|
// Don't lock mouse Y axis during fadeins
|
|
|
|
Patch<WORD>(0x51C5CD, 0x29EB);
|
|
|
|
Patch<WORD>(0x51D053, 0xE990);
|
|
|
|
InjectHook(0x531BBE, DynBaseAddress(0x531C6F), PATCH_JUMP);
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
// Fixed mirrors crash
|
|
|
|
Patch<uint64_t>(0x753941, 0xC604C4832F74C085);
|
|
|
|
|
|
|
|
// Mirrors depth fix & bumped quality
|
|
|
|
InjectHook(0x7537A0, CreateMirrorBuffers);
|
|
|
|
|
|
|
|
// Fixed MSAA options
|
|
|
|
Patch<BYTE>(0x590F77, 0xEB);
|
|
|
|
Nop(0x590F34, 2);
|
|
|
|
|
|
|
|
Patch<BYTE>(0x82B4EB, 0xEB);
|
|
|
|
Patch<BYTE>(0x82A916, 0xEB);
|
|
|
|
Patch<WORD>(0x82AED3, 0xE990);
|
|
|
|
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x590F8B, orgGetMaxMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x590F8B, GetMaxMultiSamplingLevels);
|
|
|
|
InjectHook(0x590F36, GetMaxMultiSamplingLevels);
|
|
|
|
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x5881C0, orgChangeMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x5881C0, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x590FBB, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x591111, ChangeMultiSamplingLevels);
|
|
|
|
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x77A40D, orgSetMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x77A40D, SetMultiSamplingLevels);
|
|
|
|
|
|
|
|
Patch<WORD>(0x58DDEF, 0xBA90);
|
|
|
|
Patch(0x58DDF1, MSAAText);
|
|
|
|
|
|
|
|
// Fixed car collisions - car you're hitting gets proper damage now
|
|
|
|
Nop(0x5538D0, 2);
|
|
|
|
InjectHook(0x5538D2, FixedCarDamage_Newsteam, PATCH_CALL);
|
|
|
|
|
2016-04-22 20:45:33 +02:00
|
|
|
|
|
|
|
// Car explosion crash with multimonitor
|
|
|
|
// Unitialized collision data breaking stencil shadows
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x41A661, orgMemMgrMalloc );
|
2016-04-22 20:45:33 +02:00
|
|
|
InjectHook(0x41A661, CollisionData_MallocAndInit);
|
|
|
|
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x41A4CC, orgNewAlloc );
|
2016-04-22 20:45:33 +02:00
|
|
|
InjectHook(0x41A4CC, CollisionData_NewAndInit);
|
|
|
|
InjectHook(0x41A5A9, CollisionData_NewAndInit);
|
|
|
|
|
|
|
|
|
2016-05-29 00:37:29 +02:00
|
|
|
// Crash when entering advanced display options on a dual monitor machine after:
|
|
|
|
// - starting game on primary monitor in maximum resolution, exiting,
|
|
|
|
// starting again in maximum resolution on secondary monitor.
|
|
|
|
// Secondary monitor maximum resolution had to be greater than maximum resolution of primary monitor.
|
|
|
|
// Not in 1.01
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x779B71, orgGetNumVideoModes );
|
2016-05-29 00:37:29 +02:00
|
|
|
InjectHook(0x779B71, GetNumVideoModes_Store);
|
|
|
|
InjectHook(0x779AD1, GetNumVideoModes_Retrieve);
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed escalators crash
|
|
|
|
orgEscalatorsUpdate = (void(*)())DynBaseAddress(0x735B90);
|
|
|
|
InjectHook(0x735BC5, UpdateEscalators, PATCH_JUMP);
|
|
|
|
|
|
|
|
Patch<WORD>(0x734BAE, 0x4E8D);
|
|
|
|
Patch<BYTE>(0x734BB0, 0x84);
|
|
|
|
InjectHook(0x734BB1, &CEscalator::SwitchOffNoRemove, PATCH_CALL);
|
|
|
|
Patch<WORD>(0x734BB6, 0x52EB);
|
|
|
|
|
|
|
|
|
|
|
|
// Don't allocate constant memory for stencil shadows every frame
|
|
|
|
InjectHook(0x75ADA9, StencilShadowAlloc, PATCH_CALL);
|
|
|
|
Nop(0x75ADE1, 3);
|
|
|
|
Patch<WORD>(0x75ADAE, 0x2CEB);
|
|
|
|
Patch<DWORD>(0x75AE35, 0x5D5B5E5F); // pop edi, pop esi, pop ebx, pop ebp, retn
|
|
|
|
Patch<BYTE>(0x75AE39, 0xC3);
|
|
|
|
|
|
|
|
|
2016-07-26 20:12:56 +02:00
|
|
|
// "Streaming memory bug" fix
|
|
|
|
InjectHook(0x4CF1FB, GTARtAnimInterpolatorSetCurrentAnim);
|
|
|
|
|
|
|
|
|
2016-07-27 02:00:18 +02:00
|
|
|
// Fixed ammo for melee weapons in cheats
|
|
|
|
Patch<BYTE>(0x43AD0B+1, 1); // knife
|
|
|
|
Patch<BYTE>(0x43ADF8+1, 1); // knife
|
|
|
|
Patch<BYTE>(0x43AF9F+1, 1); // chainsaw
|
|
|
|
Patch<BYTE>(0x43B058+1, 1); // chainsaw
|
|
|
|
Patch<BYTE>(0x43B9B8+1, 1); // parachute
|
|
|
|
|
|
|
|
Patch<BYTE>(0x43C492, 0x53); // katana
|
|
|
|
Patch<WORD>(0x43C493, 0x016A);
|
|
|
|
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// Proper aspect ratios
|
|
|
|
static const float f43 = 4.0f/3.0f, f54 = 5.0f/4.0f, f169 = 16.0f/9.0f;
|
|
|
|
Patch<const void*>(0x73424B, &f169);
|
|
|
|
Patch<const void*>(0x734267, &f54);
|
|
|
|
Patch<const void*>(0x73427A, &f43);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Patch_SA_NewSteam_r2_lv()
|
|
|
|
{
|
2016-08-10 22:27:58 +02:00
|
|
|
using namespace Memory::DynBase;
|
2015-04-22 15:20:40 +02:00
|
|
|
|
2015-06-28 22:17:29 +02:00
|
|
|
// (Hopefully) more precise frame limiter
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x77D44F, RsEventHandler );
|
2015-06-28 22:17:29 +02:00
|
|
|
InjectHook(0x77D44F, NewFrameRender);
|
|
|
|
InjectHook(0x77D3D8, GetTimeSinceLastFrame);
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// No framedelay
|
|
|
|
InjectHook(0x54EC06, DynBaseAddress(0x54EC4C), PATCH_JUMP);
|
|
|
|
Patch<BYTE>(0x54EC85, 0x4);
|
|
|
|
Nop(0x54EC87, 1);
|
|
|
|
|
|
|
|
// Unlock 1.0/1.01 saves loading
|
|
|
|
Patch<WORD>(0x5ED299, 0xE990);
|
|
|
|
|
|
|
|
// Old .set files working again
|
|
|
|
static const DWORD dwSetVersion = 6;
|
|
|
|
Patch<const void*>(0x59040A, &dwSetVersion);
|
|
|
|
Patch<BYTE>(0x5906ED, 6);
|
|
|
|
Patch<BYTE>(0x53EB9A, 6);
|
|
|
|
|
|
|
|
// Disable re-initialization of DirectInput mouse device by the game
|
|
|
|
Patch<BYTE>(0x58A7C1, 0xEB);
|
|
|
|
Patch<BYTE>(0x58A9A7, 0xEB);
|
|
|
|
Patch<BYTE>(0x58AA89, 0xEB);
|
|
|
|
|
|
|
|
// Unlocked widescreen resolutions
|
|
|
|
//Patch<WORD>(0x779BAD, 0x607D);
|
|
|
|
Patch<WORD>(0x779AB8, 0x697D);
|
|
|
|
Patch<DWORD>(0x7798C8, 0x9090117D);
|
|
|
|
Nop(0x779946, 2);
|
|
|
|
Nop(0x7798CC, 2);
|
|
|
|
|
|
|
|
// Make sure DirectInput mouse device is set non-exclusive (may not be needed?)
|
|
|
|
Nop(0x77AA5F, 1);
|
|
|
|
Patch<WORD>(0x77AA60, 0x01B0);
|
|
|
|
|
|
|
|
// Default resolution to native resolution
|
|
|
|
RECT desktop;
|
|
|
|
GetWindowRect(GetDesktopWindow(), &desktop);
|
2016-03-31 19:51:14 +02:00
|
|
|
sprintf_s(aNoDesktopMode, "Cannot find %dx%dx32 video mode", desktop.right, desktop.bottom);
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
Patch<DWORD>(0x77A30F, desktop.right);
|
|
|
|
Patch<DWORD>(0x77A314, desktop.bottom);
|
|
|
|
Patch<const char*>(0x77A36B, aNoDesktopMode);
|
|
|
|
|
|
|
|
// No DirectPlay dependency
|
|
|
|
Patch<BYTE>(0x77B35E, 0xB8);
|
|
|
|
Patch<DWORD>(0x77B35F, 0x900);
|
|
|
|
|
2015-04-23 17:32:18 +02:00
|
|
|
// SHGetFolderPath on User Files
|
2017-09-18 22:13:02 +02:00
|
|
|
InjectHook(0x778E90, GetMyDocumentsPathSA, PATCH_JUMP);
|
2015-04-23 17:32:18 +02:00
|
|
|
|
2015-09-20 21:21:36 +02:00
|
|
|
// Fixed muzzleflash not showing from last bullet
|
|
|
|
Nop(0x63E789, 2);
|
|
|
|
|
|
|
|
// Proper randomizations
|
|
|
|
InjectHook(0x45234C, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x45284C, Int32Rand); // Missing ped paths
|
|
|
|
InjectHook(0x69034F, Int32Rand); // Prostitutes
|
|
|
|
|
|
|
|
// Help boxes showing with big message
|
|
|
|
// Game seems to assume they can show together
|
|
|
|
Nop(0x597E3A, 6);
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
// Fixed lens flare
|
|
|
|
Nop(0x72FFF8, 5);
|
|
|
|
Patch<BYTE>(0x72FFE3, 0x20);
|
|
|
|
InjectHook(0x730004, DynBaseAddress(0x753A00), PATCH_CALL);
|
|
|
|
Patch<WORD>(0x730009, 0xE1EB);
|
|
|
|
|
|
|
|
Nop(0x72FE17, 4);
|
|
|
|
Patch<BYTE>(0x72FE1B, 0xB8);
|
|
|
|
Patch(0x72FE1C, &FlushLensSwitchZ);
|
|
|
|
|
|
|
|
Patch<DWORD>(0x72F81D, 0xB9909090);
|
|
|
|
Patch(0x72F821, &InitBufferSwitchZ);
|
|
|
|
|
2016-03-11 23:54:20 +01:00
|
|
|
// Y axis sensitivity fix
|
|
|
|
float* sens = *(float**)DynBaseAddress(0x51B8D7);
|
|
|
|
Patch<const void*>(0x51B8E3 + 0x2, sens);
|
|
|
|
Patch<const void*>(0x51C5DC + 0x2, sens);
|
|
|
|
Patch<const void*>(0x51D68A + 0x2, sens);
|
|
|
|
Patch<const void*>(0x51E98A + 0x2, sens);
|
|
|
|
Patch<const void*>(0x52FB31 + 0x2, sens);
|
|
|
|
|
2016-03-12 15:47:28 +01:00
|
|
|
// Don't lock mouse Y axis during fadeins
|
|
|
|
Patch<WORD>(0x51C51D, 0x29EB);
|
|
|
|
Patch<WORD>(0x51CFA3, 0xE990);
|
|
|
|
InjectHook(0x531B1E, DynBaseAddress(0x531BCF), PATCH_JUMP);
|
|
|
|
|
2016-03-31 20:45:49 +02:00
|
|
|
// Fixed mirrors crash
|
|
|
|
Patch<uint64_t>(0x753861, 0xC604C4832F74C085);
|
|
|
|
|
|
|
|
// Mirrors depth fix & bumped quality
|
|
|
|
InjectHook(0x7536C0, CreateMirrorBuffers);
|
|
|
|
|
|
|
|
// Fixed MSAA options
|
|
|
|
Patch<BYTE>(0x590EB7, 0xEB);
|
|
|
|
Nop(0x590E74, 2);
|
|
|
|
|
|
|
|
Patch<BYTE>(0x82B3BB, 0xEB);
|
|
|
|
Patch<BYTE>(0x82A7E6, 0xEB);
|
|
|
|
Patch<WORD>(0x82ADA3, 0xE990);
|
|
|
|
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x590ECB, orgGetMaxMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x590ECB, GetMaxMultiSamplingLevels);
|
|
|
|
InjectHook(0x590E76, GetMaxMultiSamplingLevels);
|
|
|
|
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x588100, orgChangeMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x588100, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x590EFB, ChangeMultiSamplingLevels);
|
|
|
|
InjectHook(0x591051, ChangeMultiSamplingLevels);
|
|
|
|
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x77A2FD, orgSetMultiSamplingLevels );
|
2016-03-31 20:45:49 +02:00
|
|
|
InjectHook(0x77A2FD, SetMultiSamplingLevels);
|
|
|
|
|
|
|
|
Patch<WORD>(0x58DD2F, 0xBA90);
|
|
|
|
Patch(0x58DD31, MSAAText);
|
|
|
|
|
|
|
|
// Fixed car collisions - car you're hitting gets proper damage now
|
|
|
|
Nop(0x553800, 2);
|
|
|
|
InjectHook(0x553802, FixedCarDamage_Newsteam, PATCH_CALL);
|
|
|
|
|
2016-04-22 20:45:33 +02:00
|
|
|
|
|
|
|
// Car explosion crash with multimonitor
|
|
|
|
// Unitialized collision data breaking stencil shadows
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x41A661, orgMemMgrMalloc );
|
2016-04-22 20:45:33 +02:00
|
|
|
InjectHook(0x41A661, CollisionData_MallocAndInit);
|
|
|
|
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x41A4CC, orgNewAlloc );
|
2016-04-22 20:45:33 +02:00
|
|
|
InjectHook(0x41A4CC, CollisionData_NewAndInit);
|
|
|
|
InjectHook(0x41A5A9, CollisionData_NewAndInit);
|
|
|
|
|
|
|
|
|
2016-05-29 14:33:07 +02:00
|
|
|
// Crash when entering advanced display options on a dual monitor machine after:
|
|
|
|
// - starting game on primary monitor in maximum resolution, exiting,
|
|
|
|
// starting again in maximum resolution on secondary monitor.
|
|
|
|
// Secondary monitor maximum resolution had to be greater than maximum resolution of primary monitor.
|
|
|
|
// Not in 1.01
|
2017-03-05 22:45:56 +01:00
|
|
|
ReadCall( 0x779A61, orgGetNumVideoModes );
|
2016-05-29 14:33:07 +02:00
|
|
|
InjectHook(0x779A61, GetNumVideoModes_Store);
|
|
|
|
InjectHook(0x7799C1, GetNumVideoModes_Retrieve);
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed escalators crash
|
|
|
|
orgEscalatorsUpdate = (void(*)())DynBaseAddress(0x735A90);
|
|
|
|
InjectHook(0x735AC5, UpdateEscalators, PATCH_JUMP);
|
|
|
|
|
|
|
|
Patch<WORD>(0x734AAE, 0x4E8D);
|
|
|
|
Patch<BYTE>(0x734AB0, 0x84);
|
|
|
|
InjectHook(0x734AB1, &CEscalator::SwitchOffNoRemove, PATCH_CALL);
|
|
|
|
Patch<WORD>(0x734AB6, 0x52EB);
|
|
|
|
|
|
|
|
|
|
|
|
// Don't allocate constant memory for stencil shadows every frame
|
|
|
|
InjectHook(0x75AC99, StencilShadowAlloc, PATCH_CALL);
|
|
|
|
Nop(0x75ACD1, 3);
|
|
|
|
Patch<WORD>(0x75AC9E, 0x2CEB);
|
|
|
|
Patch<DWORD>(0x75AD25, 0x5D5B5E5F); // pop edi, pop esi, pop ebx, pop ebp, retn
|
|
|
|
Patch<BYTE>(0x75AD29, 0xC3);
|
|
|
|
|
|
|
|
|
2016-07-26 20:12:56 +02:00
|
|
|
// "Streaming memory bug" fix
|
|
|
|
InjectHook(0x4CF1DB, GTARtAnimInterpolatorSetCurrentAnim);
|
|
|
|
|
|
|
|
|
2016-07-27 02:00:18 +02:00
|
|
|
// Fixed ammo for melee weapons in cheats
|
|
|
|
Patch<BYTE>(0x43AD0B+1, 1); // knife
|
|
|
|
Patch<BYTE>(0x43ADF8+1, 1); // knife
|
|
|
|
Patch<BYTE>(0x43AF9F+1, 1); // chainsaw
|
|
|
|
Patch<BYTE>(0x43B058+1, 1); // chainsaw
|
|
|
|
Patch<BYTE>(0x43B9B8+1, 1); // parachute
|
|
|
|
|
|
|
|
Patch<BYTE>(0x43C492, 0x53); // katana
|
|
|
|
Patch<WORD>(0x43C493, 0x016A);
|
|
|
|
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
// Proper aspect ratios
|
|
|
|
static const float f43 = 4.0f/3.0f, f54 = 5.0f/4.0f, f169 = 16.0f/9.0f;
|
|
|
|
Patch<const void*>(0x73414B, &f169);
|
|
|
|
Patch<const void*>(0x734167, &f54);
|
|
|
|
Patch<const void*>(0x73417A, &f43);
|
|
|
|
}
|
|
|
|
|
2017-03-05 23:05:02 +01:00
|
|
|
void Patch_SA_NewSteam_Common()
|
|
|
|
{
|
|
|
|
using namespace Memory;
|
|
|
|
using namespace hook;
|
|
|
|
|
2017-12-29 00:41:22 +01:00
|
|
|
// 6 extra directionals on Medium and higher
|
|
|
|
// push dword ptr [CGame::currArea]
|
|
|
|
// call GetMaxExtraDirectionals
|
|
|
|
// add esp, 4
|
|
|
|
// mov ebx, eax
|
|
|
|
// nop
|
|
|
|
{
|
|
|
|
auto maxdirs_addr = pattern( "83 3D ? ? ? ? 00 8D 5E 05 74 05 BB 06 00 00 00" ).get_one();
|
|
|
|
|
|
|
|
Patch( maxdirs_addr.get<void>(), { 0xFF, 0x35 } );
|
|
|
|
InjectHook( maxdirs_addr.get<void>(6), GetMaxExtraDirectionals, PATCH_CALL );
|
|
|
|
Patch( maxdirs_addr.get<void>(11), { 0x83, 0xC4, 0x04, 0x8B, 0xD8 } );
|
|
|
|
Nop( maxdirs_addr.get<void>(16), 1 );
|
|
|
|
}
|
|
|
|
|
2017-03-05 23:05:02 +01:00
|
|
|
// AI accuracy issue
|
|
|
|
{
|
2017-03-05 23:14:26 +01:00
|
|
|
auto match = pattern( "8B 82 8C 05 00 00 85 C0 74 09" ).get_one(); // 0x76DEA7 in newsteam r1
|
|
|
|
Nop(match.get<int>(0), 1);
|
|
|
|
InjectHook( match.get<int>(1), WeaponRangeMult_VehicleCheck, PATCH_CALL );
|
2017-03-05 23:05:02 +01:00
|
|
|
}
|
2017-03-07 00:40:37 +01:00
|
|
|
|
|
|
|
// Don't catch WM_SYSKEYDOWN and WM_SYSKEYUP (fixes Alt+F4)
|
|
|
|
{
|
|
|
|
auto patternie = pattern( "8B 75 10 8B ? 14 56" ).count(2); // 0x77C588 and 0x77C5CC in newsteam r2
|
|
|
|
auto defproc = get_pattern( "8B 4D 14 8B 55 10 8B 45 08" );
|
|
|
|
|
2017-05-27 21:44:22 +02:00
|
|
|
patternie.for_each_result( [&]( pattern_match match ) {
|
2017-03-07 00:40:37 +01:00
|
|
|
InjectHook( match.get<int>(0x39), defproc, PATCH_JUMP );
|
|
|
|
Patch<uint8_t>( match.get<int>(1), 0x5D ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( match.get<int>(6), 0x53 ); // esi -> ebx
|
|
|
|
Patch<uint8_t>( match.get<int>(0x26 + 1), 0xFB ); // esi -> ebx
|
|
|
|
Patch<int8_t>( match.get<int>(8 + 2), -8 ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( match.get<int>(0x18 + 2), -8 ); // use stack space for new lParam
|
|
|
|
Patch<int8_t>( match.get<int>(0x2B + 2), -8 ); // use stack space for new lParam
|
2017-05-27 21:44:22 +02:00
|
|
|
} );
|
2017-03-07 00:40:37 +01:00
|
|
|
}
|
2017-03-10 16:19:05 +01:00
|
|
|
|
|
|
|
|
|
|
|
// Reinit CCarCtrl fields (firetruck and ambulance generation)
|
|
|
|
{
|
|
|
|
void* reinit_addr = get_pattern( "53 E8 ? ? ? ? E8 ? ? ? ? D9 05 ? ? ? ? D9 1C 24", -15 );
|
|
|
|
auto timers_init = pattern( "89 45 FC DB 45 FC C6 05 ? ? ? ? 01" ).get_one();
|
|
|
|
|
|
|
|
LastTimeAmbulanceCreated_Newsteam = *timers_init.get<signed int*>(-17 + 2);
|
|
|
|
LastTimeFireTruckCreated_Newsteam = *timers_init.get<signed int*>(-11 + 2);
|
|
|
|
TimeNextMadDriverChaseCreated_Newsteam = *timers_init.get<float*>(0x41 + 2);
|
|
|
|
ReadCall( reinit_addr, orgCarCtrlReInit );
|
|
|
|
InjectHook(reinit_addr, CarCtrlReInit_SilentPatch_Newsteam);
|
|
|
|
}
|
2017-03-10 23:54:04 +01:00
|
|
|
|
|
|
|
// FuckCarCompletely not fixing panels
|
|
|
|
{
|
|
|
|
void* panel_addr = get_pattern( "C6 46 04 FA 5E 5B", -3 );
|
|
|
|
Nop(panel_addr, 3);
|
|
|
|
}
|
2017-03-11 18:48:04 +01:00
|
|
|
|
|
|
|
// 014C cargen counter fix (by spaceeinstein)
|
|
|
|
{
|
|
|
|
auto do_processing = pattern( "B8 C3 2E 57 06 F7 EE C1 FA 06" ).get_one();
|
|
|
|
|
|
|
|
Patch<uint8_t>( do_processing.get<uint8_t*>(27 + 1), 0xBF ); // movzx eax, word ptr [edi+1Ah] -> movsx eax, word ptr [edi+1Ah]
|
|
|
|
Patch<uint8_t>( do_processing.get<uint8_t*>(41), 0x74 ); // jge -> jz
|
|
|
|
}
|
2017-03-20 22:52:41 +01:00
|
|
|
|
|
|
|
// Linear filtering on script sprites
|
|
|
|
{
|
2017-04-12 21:40:46 +02:00
|
|
|
void* drawScriptSprites = get_pattern( "81 EC 94 01 00 00 53 56 57 50", 10 );
|
|
|
|
ReadCall( drawScriptSprites, orgDrawScriptSpritesAndRectangles );
|
|
|
|
InjectHook( drawScriptSprites, DrawScriptSpritesAndRectangles );
|
2017-03-20 22:52:41 +01:00
|
|
|
}
|
2018-03-28 21:23:16 +02:00
|
|
|
|
2018-04-28 16:13:29 +02:00
|
|
|
// Animated Phoenix hood scoop
|
|
|
|
// TODO
|
|
|
|
|
|
|
|
// Extra animations for planes
|
|
|
|
// TODO
|
|
|
|
|
|
|
|
// Fixed animations for boats
|
|
|
|
// TODO
|
|
|
|
|
|
|
|
// Stop BF Injection/Bandito/Hotknife rotating engine components when engine is off
|
|
|
|
// TODO
|
|
|
|
|
|
|
|
|
|
|
|
// Make freeing temp objects more aggressive to fix vending crash
|
|
|
|
InjectHook( get_pattern( "57 8B 78 08 89 45 FC 85 FF 74 5B", -9 ), CObject::TryToFreeUpTempObjects_SilentPatch, PATCH_JUMP );
|
|
|
|
|
|
|
|
|
|
|
|
// Remove FILE_FLAG_NO_BUFFERING from CdStreams
|
|
|
|
Patch<uint8_t>( get_pattern( "81 F9 00 08 00 00 ? 05", 6 ), 0xEB );
|
|
|
|
|
|
|
|
|
|
|
|
// Proper metric-imperial conversion constants
|
|
|
|
static const double METERS_TO_FEET_DIV = 1.0 / 3.280839895;
|
|
|
|
Patch<const void*>( get_pattern( "83 EC 08 DC 35 ? ? ? ? DD 1C 24", 3 + 2 ), &METERS_TO_FEET_DIV );
|
|
|
|
Patch<const void*>( get_pattern( "51 DC 35 ? ? ? ? DD 1C 24", 1 + 2 ), &METERS_TO_FEET_DIV );
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed impounding of random vehicles (because CVehicle::~CVehicle doesn't remove cars from apCarsToKeep)
|
|
|
|
{
|
|
|
|
void* recordVehicleDeleted = get_pattern( "E8 ? ? ? ? 33 C0 66 89 86" );
|
|
|
|
ReadCall( recordVehicleDeleted, orgRecordVehicleDeleted );
|
|
|
|
InjectHook( recordVehicleDeleted, RecordVehicleDeleted_AndRemoveFromVehicleList );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Don't include an extra D3DLIGHT on vehicles since we fixed directional already
|
|
|
|
// TODO when timecyc.dat illumination is fixed
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed CAEAudioUtility timers - not typecasting to float so we're not losing precision after X days of PC uptime
|
|
|
|
// Also fixed integer division by zero
|
|
|
|
{
|
|
|
|
auto staticInitialize = pattern( "FF 15 ? ? ? ? 5F 5E 85 C0" ).get_one();
|
|
|
|
|
|
|
|
Patch( staticInitialize.get<void>( 2 ), &pAudioUtilsFrequency );
|
|
|
|
InjectHook( staticInitialize.get<void>( 0x1E ), AudioUtilsGetStartTime );
|
|
|
|
InjectHook( get_pattern( "50 FF 15 ? ? ? ? DF 6D F8", -9 ), AudioUtilsGetCurrentTimeInMs, PATCH_JUMP );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Car generators placed in interiors visible everywhere
|
|
|
|
InjectHook( get_pattern( "E8 ? ? ? ? 0F B6 57 0A" ), &CEntity::SetPositionAndAreaCode );
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed bomb ownership/bombs saving for bikes
|
|
|
|
{
|
|
|
|
auto restoreForHideout = get_pattern( "8D 4E EE E8", 3 );
|
|
|
|
auto restoreImpoundGarage = get_pattern( "8D 4F EE E8", 3 );
|
|
|
|
|
|
|
|
ReadCall( restoreForHideout, CStoredCar::orgRestoreCar );
|
|
|
|
InjectHook( restoreForHideout, &CStoredCar::RestoreCar_SilentPatch );
|
|
|
|
InjectHook( restoreImpoundGarage, &CStoredCar::RestoreCar_SilentPatch );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// unnamed CdStream semaphore
|
|
|
|
{
|
|
|
|
auto semaName = pattern( "52 6A 40 FF 15" ).get_one();
|
|
|
|
|
|
|
|
Patch( semaName.get<void>( 9 ), { 0x6A, 0x00 } ); // push 0 \ nop
|
|
|
|
Nop( semaName.get<void>( 9 + 2 ), 3 );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Correct streaming when using RC vehicles
|
|
|
|
InjectHook( get_pattern( "88 1D ? ? ? ? E8 ? ? ? ? 8B F0 83 C4 04 3B F3", 6 ), FindPlayerEntityWithRC );
|
|
|
|
InjectHook( get_pattern( "E8 ? ? ? ? 83 C4 08 85 C0 74 07 C6 05" ), FindPlayerVehicle_RCWrap );
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed triangle above recruitable peds' heads
|
|
|
|
Patch<uint8_t>( get_pattern( "83 BE 98 05 00 00 ? D9 45 DC", 6 ), 8 ); // GANG2
|
2018-03-28 21:23:16 +02:00
|
|
|
|
2018-04-28 17:45:32 +02:00
|
|
|
|
|
|
|
// Credits =)
|
|
|
|
{
|
|
|
|
auto renderCredits = pattern( "83 C4 18 E8 ? ? ? ? 80 3D" ).get_one();
|
|
|
|
|
|
|
|
ReadCall( renderCredits.get<void>( -58 ), Credits::PrintCreditText );
|
|
|
|
ReadCall( renderCredits.get<void>( -5 ), Credits::PrintCreditText_Hooked );
|
|
|
|
InjectHook( renderCredits.get<void>( -5 ), Credits::PrintSPCredits );
|
|
|
|
}
|
|
|
|
|
2018-05-19 21:26:00 +02:00
|
|
|
// Fixed ammo from SCM
|
|
|
|
{
|
|
|
|
void* giveWeapon = get_pattern( "8B CE E8 ? ? ? ? 8B CE 8B D8", 2 );
|
|
|
|
|
|
|
|
ReadCall( giveWeapon, CPed::orgGiveWeapon );
|
|
|
|
InjectHook( giveWeapon, &CPed::GiveWeapon_SP );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Fixed bicycle on fire - instead of CJ being set on fire, bicycle's driver is
|
|
|
|
{
|
|
|
|
using namespace BicycleFire;
|
|
|
|
|
|
|
|
auto doStuffToGoOnFire = pattern( "83 BF 94 05 00 00 0A 75 6D 6A" ).get_one(); // 0x0054A6BE
|
|
|
|
constexpr ptrdiff_t START_FIRE_OFFSET = 0x31;
|
|
|
|
|
|
|
|
Patch( doStuffToGoOnFire.get<void>( 9 ), { 0x90, 0x57 } ); // nop \ push edi
|
|
|
|
Patch( doStuffToGoOnFire.get<void>( START_FIRE_OFFSET ), { 0x90, 0x57 } ); // nop \ push edi
|
|
|
|
InjectHook( doStuffToGoOnFire.get<void>( 9 + 2 ), GetVehicleDriver );
|
|
|
|
InjectHook( doStuffToGoOnFire.get<void>( START_FIRE_OFFSET + 2 ), GetVehicleDriver );
|
|
|
|
|
|
|
|
ReadCall( doStuffToGoOnFire.get<void>( 0x15 ), CPlayerPed::orgDoStuffToGoOnFire );
|
|
|
|
InjectHook( doStuffToGoOnFire.get<void>( 0x15 ), DoStuffToGoOnFire_NullAndPlayerCheck );
|
|
|
|
|
|
|
|
ReadCall( doStuffToGoOnFire.get<void>( START_FIRE_OFFSET + 0x10 ), CFireManager::orgStartFire );
|
|
|
|
InjectHook( doStuffToGoOnFire.get<void>( START_FIRE_OFFSET + 0x10 ), &CFireManager::StartFire_NullEntityCheck );
|
|
|
|
}
|
2018-04-28 17:45:32 +02:00
|
|
|
|
2018-03-28 21:23:16 +02:00
|
|
|
|
|
|
|
// Decreased keyboard input latency
|
|
|
|
{
|
|
|
|
using namespace KeyboardInputFix;
|
|
|
|
|
|
|
|
auto updatePads = pattern( "E8 ? ? ? ? B9 ? ? ? ? BE" ).get_one(); // 0x552DB7
|
|
|
|
|
|
|
|
NewKeyState = *updatePads.get<void*>( 10 + 1 );
|
|
|
|
OldKeyState = *updatePads.get<void*>( 15 + 1 );
|
|
|
|
TempKeyState = *updatePads.get<void*>( 27 + 1 );
|
|
|
|
objSize = *updatePads.get<uint32_t>( 5 + 1 ) * 4;
|
|
|
|
|
|
|
|
ReadCall( updatePads.get<void>( -44 ), orgClearSimButtonPressCheckers );
|
|
|
|
InjectHook( updatePads.get<void>( -44 ), ClearSimButtonPressCheckers );
|
|
|
|
Nop( updatePads.get<void>( 20 ), 2 );
|
|
|
|
Nop( updatePads.get<void>( 37 ), 2 );
|
|
|
|
}
|
2018-04-24 23:59:40 +02:00
|
|
|
|
|
|
|
// Fixed handling.cfg name matching (names don't need unique prefixes anymore)
|
|
|
|
{
|
|
|
|
using namespace HandlingNameLoadFix;
|
|
|
|
|
|
|
|
auto findExactWord = pattern( "8B 55 08 56 8D 4D EC" ).get_one(); // 0x6F849B
|
|
|
|
|
|
|
|
InjectHook( findExactWord.get<void>( -5 ), strncpy_Fix );
|
|
|
|
InjectHook( findExactWord.get<void>( 9 ), strncmp_Fix );
|
|
|
|
}
|
2017-03-05 23:05:02 +01:00
|
|
|
}
|
|
|
|
|
2015-04-22 15:20:40 +02:00
|
|
|
|
|
|
|
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
|
|
|
{
|
|
|
|
UNREFERENCED_PARAMETER(lpvReserved);
|
|
|
|
|
|
|
|
if ( fdwReason == DLL_PROCESS_ATTACH )
|
|
|
|
{
|
|
|
|
hDLLModule = hinstDLL;
|
|
|
|
|
2017-09-18 12:52:35 +02:00
|
|
|
const HINSTANCE hInstance = GetModuleHandle( nullptr );
|
|
|
|
std::unique_ptr<ScopedUnprotect::Unprotect> Protect = ScopedUnprotect::UnprotectSectionOrFullModule( hInstance, ".text" );
|
|
|
|
ScopedUnprotect::Section Protect2( hInstance, ".rdata" );
|
2016-09-12 00:11:17 +02:00
|
|
|
|
2017-12-26 00:14:39 +01:00
|
|
|
const int8_t version = Memory::GetVersion().version;
|
|
|
|
if ( version == 0 ) Patch_SA_10();
|
|
|
|
else if ( version == 1 ) Patch_SA_11(); // Not supported anymore
|
|
|
|
else if ( version == 2 ) Patch_SA_Steam(); // Not supported anymore
|
2017-03-05 23:05:02 +01:00
|
|
|
else
|
|
|
|
{
|
2017-12-26 00:14:39 +01:00
|
|
|
if ( version == 3 ) Patch_SA_NewSteam_r1();
|
|
|
|
else if ( version == 4 ) Patch_SA_NewSteam_r2();
|
|
|
|
else if ( version == 5 ) Patch_SA_NewSteam_r2_lv();
|
2017-03-05 23:05:02 +01:00
|
|
|
Patch_SA_NewSteam_Common();
|
|
|
|
}
|
2015-04-22 15:20:40 +02:00
|
|
|
}
|
|
|
|
return TRUE;
|
2018-04-20 20:33:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" __declspec(dllexport)
|
|
|
|
uint32_t GetBuildNumber()
|
|
|
|
{
|
|
|
|
return (SILENTPATCH_REVISION_ID << 8) | SILENTPATCH_BUILD_ID;
|
2014-08-03 15:38:53 +02:00
|
|
|
}
|