minimal weather stuff + multiple bugfixes

This commit is contained in:
Nikolay Korolev
2020-05-16 13:31:23 +03:00
parent 9067469f7c
commit 4defd8b75c
9 changed files with 146 additions and 91 deletions

View File

@ -17,6 +17,7 @@
#include "ModelInfo.h"
#include "Object.h"
#include "Pad.h"
#include "PedAttractor.h"
#include "Phones.h"
#include "Pickups.h"
#include "Plane.h"
@ -1116,6 +1117,14 @@ void CReplay::StoreStuffInMem(void)
for (int i = 0; i < NUMPLAYERS; i++)
nHandleOfPlayerPed[i] = CPools::GetPedPool()->GetIndex(CWorld::Players[i].m_pPed);
#endif
int i = CPools::GetPedPool()->GetSize();
while (--i >= 0) {
CPed* ped = CPools::GetPedPool()->GetSlot(i);
if (!ped)
continue;
if (ped->m_attractor)
GetPedAttractorManager()->DeRegisterPed(ped, ped->m_attractor);
}
CPools::GetVehiclePool()->Store(pBuf0, pBuf1);
CPools::GetPedPool()->Store(pBuf2, pBuf3);
CPools::GetObjectPool()->Store(pBuf4, pBuf5);

View File

@ -5248,12 +5248,8 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
ScriptParams[3] / 255.0f, ScriptParams[4] / 255.0f, ScriptParams[5] / 255.0f, 0, true);
return 0;
}
case COMMAND_STORE_WEATHER:
CWeather::StoreWeatherState();
return 0;
case COMMAND_RESTORE_WEATHER:
CWeather::RestoreWeatherState();
return 0;
//case COMMAND_STORE_WEATHER:
//case COMMAND_RESTORE_WEATHER:
case COMMAND_STORE_CLOCK:
CClock::StoreClock();
return 0;