diff --git a/plugin_sa/game_sa/CWanted.h b/plugin_sa/game_sa/CWanted.h index fa1d421a..29e6ae92 100644 --- a/plugin_sa/game_sa/CWanted.h +++ b/plugin_sa/game_sa/CWanted.h @@ -50,7 +50,7 @@ class PLUGIN_API CWanted { public: static unsigned int &MaximumWantedLevel; // default 6 - static unsigned int &nMaximumWantedLevel; // default 9200 + static unsigned int &nMaximumChaosLevel; // default 9200 static bool &bUseNewsHeliInAdditionToPolice; static void InitialiseStaticVariables(); @@ -89,4 +89,4 @@ class PLUGIN_API CWanted { bool SetPursuitCop(CCopPed* cop); }; -VALIDATE_SIZE(CWanted, 0x29C); \ No newline at end of file +VALIDATE_SIZE(CWanted, 0x29C); diff --git a/plugin_sa/game_sa/RenderWare.cpp b/plugin_sa/game_sa/RenderWare.cpp index 326d9b92..044b86c9 100644 --- a/plugin_sa/game_sa/RenderWare.cpp +++ b/plugin_sa/game_sa/RenderWare.cpp @@ -1327,7 +1327,7 @@ RwRaster* RwRasterReadMaskedRaster(const RwChar* filename, const RwChar* masknam } RwImage* RwImageFindRasterFormat(RwImage* ipImage, RwInt32 nRasterType, RwInt32* npWidth, RwInt32* npHeight, RwInt32* npDepth, RwInt32* npFormat) { - return ((RwImage*(__cdecl *)(RwImage*, RwInt32, RwInt32*, RwInt32*, RwInt32*, RwInt32*))0x8042C0)(ipImage, nRasterType, npWidth, npHeight, npDepth, npFormat); + return ((RwImage*(__cdecl *)(RwImage*, RwInt32, RwInt32*, RwInt32*, RwInt32*, RwInt32*))0x8042C0)(ipImage, nRasterType, npWidth, npHeight, npDepth, npFormat); } RwFrame* RwFrameForAllObjects(RwFrame* frame, RwObjectCallBack callBack, void* data) { diff --git a/plugin_sa/game_sa/eCrimeType.h b/plugin_sa/game_sa/eCrimeType.h index 6033010a..bd62a907 100644 --- a/plugin_sa/game_sa/eCrimeType.h +++ b/plugin_sa/game_sa/eCrimeType.h @@ -7,18 +7,27 @@ #pragma once enum eCrimeType { + CRIME_NONE = 0, CRIME_FIRE_WEAPON = 1, CRIME_DAMAGED_PED = 2, CRIME_FIRE_WEAPON_HIT_PED = 3, CRIME_DAMAGE_CAR = 4, CRIME_DAMAGE_COP_CAR = 5, CRIME_CAR_STEAL = 6, + CRIME_RUN_REDLIGHT = 7, + CRIME_VEHICLE_DAMAGE = 8, + CRIME_SPEEDING = 9, CRIME_KILL_PED_WITH_CAR = 10, CRIME_KILL_COP_PED_WITH_CAR = 11, + CRIME_DESTROY_HELI = 12, CRIME_SET_PED_ON_FIRE = 13, CRIME_SET_COP_PED_ON_FIRE = 14, CRIME_SET_CAR_ON_FIRE = 15, + CRIME_DESTROY_PLANE = 16, CRIME_EXPLOSION = 17, + CRIME_STAB_PED = 18, + CRIME_STAB_COP = 19, + CRIME_DESTROY_VEHICLE = 20, CRIME_HIT_CAR = 21, CRIME_AIM_GUN = 22 }; \ No newline at end of file