mirror of
https://github.com/halpz/re3.git
synced 2025-07-03 01:30:45 +00:00
Merge remote-tracking branch 'upstream/master' into carctrl_dev
This commit is contained in:
@ -1,6 +1,8 @@
|
||||
#include "common.h"
|
||||
#include "patcher.h"
|
||||
#include "Game.h"
|
||||
#include "World.h"
|
||||
#include "Entity.h"
|
||||
#include "Population.h"
|
||||
|
||||
PedGroup *CPopulation::ms_pPedGroups = (PedGroup*)0x6E9248;
|
||||
@ -14,3 +16,10 @@ WRAPPER void CPopulation::UpdatePedCount(uint32, bool) { EAXJMP(0x4F5A60); }
|
||||
WRAPPER void CPopulation::DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool) { EAXJMP(0x4F6200); }
|
||||
WRAPPER CPed *CPopulation::AddPedInCar(CVehicle *vehicle) { EAXJMP(0x4F5800); }
|
||||
WRAPPER bool CPopulation::IsPointInSafeZone(CVector *coors) { EAXJMP(0x4F60C0); }
|
||||
|
||||
void
|
||||
CPopulation::RemovePed(CEntity* ent)
|
||||
{
|
||||
CWorld::Remove(ent);
|
||||
delete ent;
|
||||
}
|
||||
|
@ -24,4 +24,5 @@ public:
|
||||
static void DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool);
|
||||
static CPed *AddPedInCar(CVehicle *vehicle);
|
||||
static bool IsPointInSafeZone(CVector *coors);
|
||||
static void RemovePed(CEntity* ent);
|
||||
};
|
||||
|
@ -1,6 +1,10 @@
|
||||
#include "common.h"
|
||||
#include "patcher.h"
|
||||
#include "Record.h"
|
||||
|
||||
uint16 &CRecordDataForGame::RecordingState = *(uint16*)0x95CC24;
|
||||
|
||||
uint8 &CRecordDataForChase::Status = *(uint8*)0x95CDCE;
|
||||
|
||||
WRAPPER void CRecordDataForChase::ProcessControlCars(void) { EAXJMP(0x435540); }
|
||||
WRAPPER void CRecordDataForChase::SaveOrRetrieveCarPositions(void) { EAXJMP(0x434B20); }
|
@ -6,14 +6,18 @@ enum {
|
||||
RECORDSTATE_2,
|
||||
};
|
||||
|
||||
class CRecordDataForChase
|
||||
{
|
||||
public:
|
||||
static uint8 &Status;
|
||||
|
||||
static void ProcessControlCars(void);
|
||||
static void SaveOrRetrieveCarPositions(void);
|
||||
};
|
||||
|
||||
|
||||
class CRecordDataForGame
|
||||
{
|
||||
public:
|
||||
static uint16 &RecordingState;
|
||||
};
|
||||
|
||||
class CRecordDataForChase
|
||||
{
|
||||
public:
|
||||
static uint8 &Status;
|
||||
};
|
||||
|
Reference in New Issue
Block a user