Nofated095
/
re-GTA
mirror of https://github.com/Nofated095/re-GTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stats fix

This commit is contained in:
Nikolay Korolev 2020-04-06 19:31:08 +03:00
parent cf804dee91
commit 4f1d6123dd
3 changed files with 51 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/control/Garages.cpp
View File

@ -526,7 +526,7 @@ void CGarage::Update()
((CAutomobile*)(FindPlayerVehicle()))->m_pBombRigger = FindPlayerPed(); ((CAutomobile*)(FindPlayerVehicle()))->m_pBombRigger = FindPlayerPed();
if (m_eGarageType == GARAGE_BOMBSHOP3) if (m_eGarageType == GARAGE_BOMBSHOP3)
CGarages::GivePlayerDetonator(); CGarages::GivePlayerDetonator();
CStats::KgOfExplosivesUsed += KGS_OF_EXPLOSIVES_IN_BOMB; CStats::KgsOfExplosivesUsed += KGS_OF_EXPLOSIVES_IN_BOMB;
} }
switch (m_eGarageType) { switch (m_eGarageType) {
case GARAGE_BOMBSHOP1: case GARAGE_BOMBSHOP1:

108
src/core/Stats.cpp
View File

@ -63,62 +63,56 @@ void CStats::Init()
PeopleKilledByOthers = 0; PeopleKilledByOthers = 0;
PeopleKilledByPlayer = 0; PeopleKilledByPlayer = 0;
ShotsMade = 0; ShotsMade = 0;
CarsExploded = 0; CarsExploded = 0;
HelisDestroyed = 0; HelisDestroyed = 0;
ProgressMade = 0; ProgressMade = 0;
KgsOfExplosivesUsed = 0; KgsOfExplosivesUsed = 0;
InstantHitsFiredByPlayer = 0; InstantHitsFiredByPlayer = 0;
InstantHitsHitByPlayer = 0; InstantHitsHitByPlayer = 0;
CarsCrushed = 0; CarsCrushed = 0;
HeadsPopped = 0; HeadsPopped = 0;
TimesArrested = 0; TimesArrested = 0;
TimesDied = 0; TimesDied = 0;
DaysPassed = 0; DaysPassed = 0;
NumberOfUniqueJumpsFound = 0; NumberOfUniqueJumpsFound = 0;
mmRain = 0; mmRain = 0;
MaximumJumpFlips = 0; MaximumJumpFlips = 0;
MaximumJumpSpins = 0; MaximumJumpSpins = 0;
MaximumJumpDistance = 0; MaximumJumpDistance = 0;
MaximumJumpHeight = 0; MaximumJumpHeight = 0;
BestStuntJump = 0; BestStuntJump = 0;
TotalNumberOfUniqueJumps = 0; TotalNumberOfUniqueJumps = 0;
Record4x4One = 0; Record4x4One = 0;
LongestFlightInDodo = 0; LongestFlightInDodo = 0;
Record4x4Two = 0; Record4x4Two = 0;
PassengersDroppedOffWithTaxi = 0; PassengersDroppedOffWithTaxi = 0;
Record4x4Three = 0; Record4x4Three = 0;
MoneyMadeWithTaxi = 0; MoneyMadeWithTaxi = 0;
Record4x4Mayhem = 0; Record4x4Mayhem = 0;
LivesSavedWithAmbulance = 0; LivesSavedWithAmbulance = 0;
ElBurroTime = 0; ElBurroTime = 0;
CriminalsCaught = 0; CriminalsCaught = 0;
MissionsGiven = 0; MissionsGiven = 0;
HighestLevelAmbulanceMission = 0; HighestLevelAmbulanceMission = 0;
MissionsPassed = 0; MissionsPassed = 0;
FiresExtinguished = 0; FiresExtinguished = 0;
DistanceTravelledOnFoot = 0; DistanceTravelledOnFoot = 0;
TimeTakenDefuseMission = 0; TimeTakenDefuseMission = 0;
NumberKillFrenziesPassed = 0; NumberKillFrenziesPassed = 0;
DistanceTravelledInVehicle = 0; DistanceTravelledInVehicle = 0;
TotalNumberKillFrenzies = 0; TotalNumberKillFrenzies = 0;
TotalNumberMissions = 0; TotalNumberMissions = 0;
KillsSinceLastCheckpoint = 0; KillsSinceLastCheckpoint = 0;
TotalLegitimateKills = 0; TotalLegitimateKills = 0;
for (int i = 0; i < TOTAL_FASTEST_TIMES; i++) for (int i = 0; i < TOTAL_FASTEST_TIMES; i++)
{ FastestTimes[i] = 0;
FastestTimes[i] = 0; for (int i = 0; i < TOTAL_HIGHEST_SCORES; i++)
} HighestScores[i] = 0;
for (int i = 0; i < TOTAL_HIGHEST_SCORES; i++) for (int i = 0; i < NUM_PEDTYPES; i++)
{ PedsKilledOfThisType[i] = 0;
HighestScores[i] = 0; IndustrialPassed = 0;
} CommercialPassed = 0;
for (int i = 0; i < NUM_PEDTYPES; i++) SuburbanPassed = 0;
{
PedsKilledOfThisType[i] = 0;
}
IndustrialPassed = 0;
CommercialPassed = 0;
SuburbanPassed = 0;
} }
void CStats::RegisterFastestTime(int32 index, int32 time) void CStats::RegisterFastestTime(int32 index, int32 time)
@ -206,8 +200,6 @@ void CStats::SetTotalNumberMissions(int32 total)
TotalNumberMissions = total; TotalNumberMissions = total;
} }
//WRAPPER void CStats::Init() { EAXJMP(0x4AAC60); }
STARTPATCHES STARTPATCHES
InjectHook(0x48C5A3, CStats::Init, PATCH_JUMP); // CGame::ReInitGameObjectVariables InjectHook(0x48C5A3, CStats::Init, PATCH_JUMP); // CGame::ReInitGameObjectVariables
ENDPATCHES ENDPATCHES

3
src/core/Stats.h
View File

@ -62,8 +62,6 @@ public:
static int32 &CarsCrushed; static int32 &CarsCrushed;
static int32(&FastestTimes)[TOTAL_FASTEST_TIMES]; static int32(&FastestTimes)[TOTAL_FASTEST_TIMES];
static int32(&HighestScores)[TOTAL_HIGHEST_SCORES]; static int32(&HighestScores)[TOTAL_HIGHEST_SCORES];
static int32 &KgOfExplosivesUsed;
static int32 &CarsCrushed;
public: public:
static void RegisterFastestTime(int32, int32); static void RegisterFastestTime(int32, int32);
@ -85,6 +83,5 @@ public:
static void CheckPointReachedSuccessfully() { TotalLegitimateKills += KillsSinceLastCheckpoint; KillsSinceLastCheckpoint = 0; }; static void CheckPointReachedSuccessfully() { TotalLegitimateKills += KillsSinceLastCheckpoint; KillsSinceLastCheckpoint = 0; };
static void RegisterElBurroTime(int32); static void RegisterElBurroTime(int32);
static void SaveStats(uint8 *buf, uint32 *size); static void SaveStats(uint8 *buf, uint32 *size);
static void Init(void); static void Init(void);
}; };