mirror of
https://github.com/GTAmodding/re3.git
synced 2021-02-19 17:49:54 +01:00
CGame::Process() && CGame::ReloadIPLs
This commit is contained in:
parent
32f2f3511c
commit
f56684d04e
@ -6,6 +6,8 @@
|
|||||||
|
|
||||||
CAccidentManager& gAccidentManager = *(CAccidentManager*)0x87FD10;
|
CAccidentManager& gAccidentManager = *(CAccidentManager*)0x87FD10;
|
||||||
|
|
||||||
|
WRAPPER void CAccidentManager::Update(void) { EAXJMP(0x456710); }
|
||||||
|
|
||||||
uint16 CAccidentManager::CountActiveAccidents()
|
uint16 CAccidentManager::CountActiveAccidents()
|
||||||
{
|
{
|
||||||
uint16 accidents = 0;
|
uint16 accidents = 0;
|
||||||
|
@ -22,6 +22,7 @@ class CAccidentManager
|
|||||||
public:
|
public:
|
||||||
uint16 CountActiveAccidents();
|
uint16 CountActiveAccidents();
|
||||||
CAccident* FindNearestAccident(CVector, float*);
|
CAccident* FindNearestAccident(CVector, float*);
|
||||||
|
void Update(void);
|
||||||
};
|
};
|
||||||
|
|
||||||
extern CAccidentManager& gAccidentManager;
|
extern CAccidentManager& gAccidentManager;
|
@ -5,4 +5,6 @@
|
|||||||
WRAPPER bool CCranes::IsThisCarBeingTargettedByAnyCrane(CVehicle*) { EAXJMP(0x5451E0); }
|
WRAPPER bool CCranes::IsThisCarBeingTargettedByAnyCrane(CVehicle*) { EAXJMP(0x5451E0); }
|
||||||
WRAPPER bool CCranes::IsThisCarBeingCarriedByAnyCrane(CVehicle*) { EAXJMP(0x545190); }
|
WRAPPER bool CCranes::IsThisCarBeingCarriedByAnyCrane(CVehicle*) { EAXJMP(0x545190); }
|
||||||
WRAPPER void CCranes::ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float) { EAXJMP(0x543650); }
|
WRAPPER void CCranes::ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float) { EAXJMP(0x543650); }
|
||||||
WRAPPER void CCranes::DeActivateCrane(float, float) { EAXJMP(0x543890); }
|
WRAPPER void CCranes::DeActivateCrane(float, float) { EAXJMP(0x543890); }
|
||||||
|
WRAPPER void CCranes::InitCranes(void) { EAXJMP(0x543360); }
|
||||||
|
WRAPPER void CCranes::UpdateCranes(void) { EAXJMP(0x5439E0); }
|
@ -10,4 +10,6 @@ public:
|
|||||||
static bool IsThisCarBeingCarriedByAnyCrane(CVehicle*);
|
static bool IsThisCarBeingCarriedByAnyCrane(CVehicle*);
|
||||||
static void ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float);
|
static void ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float);
|
||||||
static void DeActivateCrane(float, float);
|
static void DeActivateCrane(float, float);
|
||||||
|
static void InitCranes(void);
|
||||||
|
static void UpdateCranes(void);
|
||||||
};
|
};
|
||||||
|
@ -25,6 +25,9 @@ bool &CGarages::PlayerInGarage = *(bool *)0x95CD83;
|
|||||||
int32 &CGarages::PoliceCarsCollected = *(int32 *)0x941444;
|
int32 &CGarages::PoliceCarsCollected = *(int32 *)0x941444;
|
||||||
uint32 &CGarages::GarageToBeTidied = *(uint32 *)0x623570;
|
uint32 &CGarages::GarageToBeTidied = *(uint32 *)0x623570;
|
||||||
|
|
||||||
|
WRAPPER void CGarages::Init(void) { EAXJMP(0x421C60); }
|
||||||
|
WRAPPER void CGarages::Update(void) { EAXJMP(0x421E40); }
|
||||||
|
|
||||||
bool
|
bool
|
||||||
CGarages::IsModelIndexADoor(uint32 id)
|
CGarages::IsModelIndexADoor(uint32 id)
|
||||||
{
|
{
|
||||||
@ -116,4 +119,4 @@ void CGarages::PrintMessages()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
@ -28,4 +28,6 @@ public:
|
|||||||
static bool IsPointWithinHideOutGarage(CVector&);
|
static bool IsPointWithinHideOutGarage(CVector&);
|
||||||
static bool IsPointWithinAnyGarage(CVector&);
|
static bool IsPointWithinAnyGarage(CVector&);
|
||||||
static void PlayerArrestedOrDied();
|
static void PlayerArrestedOrDied();
|
||||||
|
static void Init(void);
|
||||||
|
static void Update(void);
|
||||||
};
|
};
|
||||||
|
@ -15,6 +15,8 @@ CPhone *&CPhoneInfo::pickedUpPhone = *(CPhone**)0x6283B0;
|
|||||||
bool &CPhoneInfo::isPhoneBeingPickedUp = *(bool*)0x6283B4;
|
bool &CPhoneInfo::isPhoneBeingPickedUp = *(bool*)0x6283B4;
|
||||||
CPed *&CPhoneInfo::pedWhoPickingUpPhone = *(CPed**)0x6283B8;
|
CPed *&CPhoneInfo::pedWhoPickingUpPhone = *(CPed**)0x6283B8;
|
||||||
|
|
||||||
|
WRAPPER void CPhoneInfo::Update(void) { EAXJMP(0x42F7A0); }
|
||||||
|
|
||||||
int
|
int
|
||||||
CPhoneInfo::FindNearestFreePhone(CVector *pos)
|
CPhoneInfo::FindNearestFreePhone(CVector *pos)
|
||||||
{
|
{
|
||||||
|
@ -56,6 +56,7 @@ public:
|
|||||||
int GrabPhone(float, float);
|
int GrabPhone(float, float);
|
||||||
void Initialise(void);
|
void Initialise(void);
|
||||||
void Shutdown(void);
|
void Shutdown(void);
|
||||||
|
void Update(void);
|
||||||
};
|
};
|
||||||
|
|
||||||
extern CPhoneInfo &gPhoneInfo;
|
extern CPhoneInfo &gPhoneInfo;
|
||||||
|
@ -47,6 +47,7 @@ uint8 aWeaponBlues[] = { 0, 0, 255, 0, 255, 255, 0, 128, 255, 0, 255, 0, 128, 25
|
|||||||
float aWeaponScale[] = { 1.0f, 2.0f, 1.5f, 1.0f, 1.0f, 1.5f, 1.0f, 2.0f, 1.0f, 2.0f, 2.5f, 1.0f, 1.0f, 1.0f, 1.0f };
|
float aWeaponScale[] = { 1.0f, 2.0f, 1.5f, 1.0f, 1.0f, 1.5f, 1.0f, 2.0f, 1.0f, 2.0f, 2.5f, 1.0f, 1.0f, 1.0f, 1.0f };
|
||||||
|
|
||||||
WRAPPER void CPacManPickups::Render(void) { EAXJMP(0x432F60); }
|
WRAPPER void CPacManPickups::Render(void) { EAXJMP(0x432F60); }
|
||||||
|
WRAPPER void CPacManPickups::Update(void) { EAXJMP(0x432800); }
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -106,4 +106,5 @@ class CPacManPickups
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static void Render(void);
|
static void Render(void);
|
||||||
|
static void Update(void);
|
||||||
};
|
};
|
||||||
|
@ -31,6 +31,7 @@ uint32& CPopulation::ms_nNumGang9 = *(uint32*)0x8F1B10;
|
|||||||
uint32& CPopulation::ms_nNumGang7 = *(uint32*)0x8F1B28;
|
uint32& CPopulation::ms_nNumGang7 = *(uint32*)0x8F1B28;
|
||||||
uint32& CPopulation::ms_nNumGang8 = *(uint32*)0x8F1B0C;
|
uint32& CPopulation::ms_nNumGang8 = *(uint32*)0x8F1B0C;
|
||||||
|
|
||||||
|
WRAPPER void CPopulation::Update(void) { EAXJMP(0x4F39A0); }
|
||||||
WRAPPER void CPopulation::LoadPedGroups() { EAXJMP(0x4F3870); }
|
WRAPPER void CPopulation::LoadPedGroups() { EAXJMP(0x4F3870); }
|
||||||
WRAPPER void CPopulation::UpdatePedCount(uint32, bool) { EAXJMP(0x4F5A60); }
|
WRAPPER void CPopulation::UpdatePedCount(uint32, bool) { EAXJMP(0x4F5A60); }
|
||||||
WRAPPER void CPopulation::DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool) { EAXJMP(0x4F6200); }
|
WRAPPER void CPopulation::DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool) { EAXJMP(0x4F6200); }
|
||||||
|
@ -40,6 +40,7 @@ public:
|
|||||||
static uint32& ms_nNumGang8;
|
static uint32& ms_nNumGang8;
|
||||||
|
|
||||||
static void Initialise();
|
static void Initialise();
|
||||||
|
static void Update(void);
|
||||||
static void LoadPedGroups();
|
static void LoadPedGroups();
|
||||||
static void UpdatePedCount(uint32, bool);
|
static void UpdatePedCount(uint32, bool);
|
||||||
static void DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool);
|
static void DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool);
|
||||||
|
@ -6,5 +6,8 @@ uint16 &CRecordDataForGame::RecordingState = *(uint16*)0x95CC24;
|
|||||||
|
|
||||||
uint8 &CRecordDataForChase::Status = *(uint8*)0x95CDCE;
|
uint8 &CRecordDataForChase::Status = *(uint8*)0x95CDCE;
|
||||||
|
|
||||||
|
WRAPPER void CRecordDataForGame::SaveOrRetrieveDataForThisFrame(void) { EAXJMP(0x4341F0); }
|
||||||
|
|
||||||
|
WRAPPER void CRecordDataForChase::SaveOrRetrieveDataForThisFrame(void) { EAXJMP(0x4347F0); }
|
||||||
WRAPPER void CRecordDataForChase::ProcessControlCars(void) { EAXJMP(0x435540); }
|
WRAPPER void CRecordDataForChase::ProcessControlCars(void) { EAXJMP(0x435540); }
|
||||||
WRAPPER void CRecordDataForChase::SaveOrRetrieveCarPositions(void) { EAXJMP(0x434B20); }
|
WRAPPER void CRecordDataForChase::SaveOrRetrieveCarPositions(void) { EAXJMP(0x434B20); }
|
@ -11,6 +11,7 @@ class CRecordDataForChase
|
|||||||
public:
|
public:
|
||||||
static uint8 &Status;
|
static uint8 &Status;
|
||||||
|
|
||||||
|
static void SaveOrRetrieveDataForThisFrame(void);
|
||||||
static void ProcessControlCars(void);
|
static void ProcessControlCars(void);
|
||||||
static void SaveOrRetrieveCarPositions(void);
|
static void SaveOrRetrieveCarPositions(void);
|
||||||
};
|
};
|
||||||
@ -20,4 +21,6 @@ class CRecordDataForGame
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static uint16 &RecordingState;
|
static uint16 &RecordingState;
|
||||||
|
|
||||||
|
static void SaveOrRetrieveDataForThisFrame(void);
|
||||||
};
|
};
|
||||||
|
@ -2,4 +2,6 @@
|
|||||||
#include "patcher.h"
|
#include "patcher.h"
|
||||||
#include "RoadBlocks.h"
|
#include "RoadBlocks.h"
|
||||||
|
|
||||||
|
WRAPPER void CRoadBlocks::Init(void) { EAXJMP(0x436F50); }
|
||||||
WRAPPER void CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle*, int32, int16) { EAXJMP(0x4376A0); }
|
WRAPPER void CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle*, int32, int16) { EAXJMP(0x4376A0); }
|
||||||
|
WRAPPER void CRoadBlocks::GenerateRoadBlocks(void) { EAXJMP(0x436FA0); }
|
@ -6,5 +6,7 @@ class CVehicle;
|
|||||||
class CRoadBlocks
|
class CRoadBlocks
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
static void Init(void);
|
||||||
static void GenerateRoadBlockCopsForCar(CVehicle*, int32, int16);
|
static void GenerateRoadBlockCopsForCar(CVehicle*, int32, int16);
|
||||||
|
static void GenerateRoadBlocks(void);
|
||||||
};
|
};
|
||||||
|
5
src/control/SceneEdit.cpp
Normal file
5
src/control/SceneEdit.cpp
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#include "common.h"
|
||||||
|
#include "patcher.h"
|
||||||
|
#include "SceneEdit.h"
|
||||||
|
|
||||||
|
WRAPPER void CSceneEdit::Update(void) { EAXJMP(0x585570); }
|
7
src/control/SceneEdit.h
Normal file
7
src/control/SceneEdit.h
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
class CSceneEdit
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
static void Update(void);
|
||||||
|
};
|
@ -5,6 +5,7 @@
|
|||||||
#include "Vehicle.h"
|
#include "Vehicle.h"
|
||||||
|
|
||||||
WRAPPER void CTrafficLights::DisplayActualLight(CEntity *ent) { EAXJMP(0x455800); }
|
WRAPPER void CTrafficLights::DisplayActualLight(CEntity *ent) { EAXJMP(0x455800); }
|
||||||
|
WRAPPER void CTrafficLights::ScanForLightsOnMap(void) { EAXJMP(0x454F40); }
|
||||||
WRAPPER bool CTrafficLights::ShouldCarStopForLight(CVehicle*, bool) { EAXJMP(0x455350); }
|
WRAPPER bool CTrafficLights::ShouldCarStopForLight(CVehicle*, bool) { EAXJMP(0x455350); }
|
||||||
WRAPPER bool CTrafficLights::ShouldCarStopForBridge(CVehicle*) { EAXJMP(0x456460); }
|
WRAPPER bool CTrafficLights::ShouldCarStopForBridge(CVehicle*) { EAXJMP(0x456460); }
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@ class CTrafficLights
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static void DisplayActualLight(CEntity *ent);
|
static void DisplayActualLight(CEntity *ent);
|
||||||
|
static void ScanForLightsOnMap(void);
|
||||||
static uint8 LightForPeds(void);
|
static uint8 LightForPeds(void);
|
||||||
static bool ShouldCarStopForLight(CVehicle*, bool);
|
static bool ShouldCarStopForLight(CVehicle*, bool);
|
||||||
static bool ShouldCarStopForBridge(CVehicle*);
|
static bool ShouldCarStopForBridge(CVehicle*);
|
||||||
|
@ -25,6 +25,8 @@
|
|||||||
#include "CdStream.h"
|
#include "CdStream.h"
|
||||||
#include "FileLoader.h"
|
#include "FileLoader.h"
|
||||||
|
|
||||||
|
WRAPPER void CFileLoader::ReloadPaths(const char *filename) { EAXJMP(0x476DB0); }
|
||||||
|
|
||||||
char CFileLoader::ms_line[256];
|
char CFileLoader::ms_line[256];
|
||||||
|
|
||||||
const char*
|
const char*
|
||||||
|
@ -39,4 +39,6 @@ public:
|
|||||||
static void LoadPickup(const char *line);
|
static void LoadPickup(const char *line);
|
||||||
|
|
||||||
static void LoadMapZones(const char *filename);
|
static void LoadMapZones(const char *filename);
|
||||||
|
|
||||||
|
static void ReloadPaths(const char *filename);
|
||||||
};
|
};
|
||||||
|
@ -32,4 +32,5 @@ CFire* CFireManager::FindNearestFire(CVector vecPos, float* pDistance)
|
|||||||
}
|
}
|
||||||
|
|
||||||
WRAPPER void CFireManager::StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32) { EAXJMP(0x479590); }
|
WRAPPER void CFireManager::StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32) { EAXJMP(0x479590); }
|
||||||
|
WRAPPER void CFireManager::Update(void) { EAXJMP(0x479310); }
|
||||||
WRAPPER CFire *CFireManager::FindFurthestFire_NeverMindFireMen(CVector coors, float, float) { EAXJMP(0x479430); }
|
WRAPPER CFire *CFireManager::FindFurthestFire_NeverMindFireMen(CVector coors, float, float) { EAXJMP(0x479430); }
|
||||||
|
@ -31,6 +31,7 @@ class CFireManager
|
|||||||
CFire m_aFires[NUM_FIRES];
|
CFire m_aFires[NUM_FIRES];
|
||||||
public:
|
public:
|
||||||
void StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32);
|
void StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32);
|
||||||
|
void Update(void);
|
||||||
CFire *FindFurthestFire_NeverMindFireMen(CVector coors, float, float);
|
CFire *FindFurthestFire_NeverMindFireMen(CVector coors, float, float);
|
||||||
CFire *FindNearestFire(CVector, float*);
|
CFire *FindNearestFire(CVector, float*);
|
||||||
uint32 GetTotalActiveFires() const { return m_nTotalFires; }
|
uint32 GetTotalActiveFires() const { return m_nTotalFires; }
|
||||||
|
@ -2,8 +2,59 @@
|
|||||||
#include "patcher.h"
|
#include "patcher.h"
|
||||||
#include "Game.h"
|
#include "Game.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#include "AccidentManager.h"
|
||||||
|
#include "Antennas.h"
|
||||||
|
#include "Bridge.h"
|
||||||
|
#include "Camera.h"
|
||||||
|
#include "CarCtrl.h"
|
||||||
|
#include "CarGen.h"
|
||||||
#include "CdStream.h"
|
#include "CdStream.h"
|
||||||
|
#include "Clock.h"
|
||||||
|
#include "Clouds.h"
|
||||||
|
#include "Collision.h"
|
||||||
|
#include "Coronas.h"
|
||||||
|
#include "Cranes.h"
|
||||||
|
#include "CutsceneMgr.h"
|
||||||
|
#include "Darkel.h"
|
||||||
|
#include "EventList.h"
|
||||||
|
#include "FileLoader.h"
|
||||||
#include "FileMgr.h"
|
#include "FileMgr.h"
|
||||||
|
#include "Fire.h"
|
||||||
|
#include "Fluff.h"
|
||||||
|
#include "Font.h"
|
||||||
|
#include "Frontend.h"
|
||||||
|
#include "GameLogic.h"
|
||||||
|
#include "Garages.h"
|
||||||
|
#include "Glass.h"
|
||||||
|
#include "Heli.h"
|
||||||
|
#include "Pad.h"
|
||||||
|
#include "Particle.h"
|
||||||
|
#include "Phones.h"
|
||||||
|
#include "Pickups.h"
|
||||||
|
#include "Plane.h"
|
||||||
|
#include "Population.h"
|
||||||
|
#include "Record.h"
|
||||||
|
#include "Renderer.h"
|
||||||
|
#include "Replay.h"
|
||||||
|
#include "RoadBlocks.h"
|
||||||
|
#include "Rubbish.h"
|
||||||
|
#include "SceneEdit.h"
|
||||||
|
#include "Script.h"
|
||||||
|
#include "Shadows.h"
|
||||||
|
#include "Skidmarks.h"
|
||||||
|
#include "SpecialFX.h"
|
||||||
|
#include "Sprite2d.h"
|
||||||
|
#include "Streaming.h"
|
||||||
|
#include "TimeCycle.h"
|
||||||
|
#include "TrafficLights.h"
|
||||||
|
#include "Train.h"
|
||||||
|
#include "User.h"
|
||||||
|
#include "WaterCannon.h"
|
||||||
|
#include "Weapon.h"
|
||||||
|
#include "Weather.h"
|
||||||
|
#include "World.h"
|
||||||
|
#include "ZoneCull.h"
|
||||||
|
#include "Zones.h"
|
||||||
|
|
||||||
eLevelName &CGame::currLevel = *(eLevelName*)0x941514;
|
eLevelName &CGame::currLevel = *(eLevelName*)0x941514;
|
||||||
bool &CGame::bDemoMode = *(bool*)0x5F4DD0;
|
bool &CGame::bDemoMode = *(bool*)0x5F4DD0;
|
||||||
@ -25,9 +76,104 @@ CGame::InitialiseOnceBeforeRW(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
WRAPPER void CGame::Initialise(const char *datFile) { EAXJMP(0x48BED0); }
|
WRAPPER void CGame::Initialise(const char *datFile) { EAXJMP(0x48BED0); }
|
||||||
|
#if 0
|
||||||
WRAPPER void CGame::Process(void) { EAXJMP(0x48C850); }
|
WRAPPER void CGame::Process(void) { EAXJMP(0x48C850); }
|
||||||
|
#else
|
||||||
|
void CGame::Process(void)
|
||||||
|
{
|
||||||
|
CPad::UpdatePads();
|
||||||
|
TheCamera.SetMotionBlurAlpha(0);
|
||||||
|
if (TheCamera.m_BlurType == 0 || TheCamera.m_BlurType == 1 || TheCamera.m_BlurType == 2)
|
||||||
|
TheCamera.SetMotionBlur(0, 0, 0, 0, 0);
|
||||||
|
CCutsceneMgr::Update();
|
||||||
|
if (!CCutsceneMgr::ms_cutsceneProcessing && !CTimer::GetIsCodePaused())
|
||||||
|
FrontEndMenuManager.Process();
|
||||||
|
CStreaming::Update();
|
||||||
|
if (!CTimer::GetIsPaused())
|
||||||
|
{
|
||||||
|
CTheZones::Update();
|
||||||
|
CSprite2d::SetRecipNearClip();
|
||||||
|
CSprite2d::InitPerFrame();
|
||||||
|
CFont::InitPerFrame();
|
||||||
|
CRecordDataForGame::SaveOrRetrieveDataForThisFrame();
|
||||||
|
CRecordDataForChase::SaveOrRetrieveDataForThisFrame();
|
||||||
|
CPad::DoCheats();
|
||||||
|
CClock::Update();
|
||||||
|
CWeather::Update();
|
||||||
|
CTheScripts::Process();
|
||||||
|
CCollision::Update();
|
||||||
|
CTrain::UpdateTrains();
|
||||||
|
CPlane::UpdatePlanes();
|
||||||
|
CHeli::UpdateHelis();
|
||||||
|
CDarkel::Update();
|
||||||
|
CSkidmarks::Update();
|
||||||
|
CAntennas::Update();
|
||||||
|
CGlass::Update();
|
||||||
|
CSceneEdit::Update();
|
||||||
|
CEventList::Update();
|
||||||
|
CParticle::Update();
|
||||||
|
gFireManager.Update();
|
||||||
|
CPopulation::Update();
|
||||||
|
CWeapon::UpdateWeapons();
|
||||||
|
if (!CCutsceneMgr::IsRunning())
|
||||||
|
CTheCarGenerators::Process();
|
||||||
|
if (!CReplay::IsPlayingBack())
|
||||||
|
CCranes::UpdateCranes();
|
||||||
|
CClouds::Update();
|
||||||
|
CMovingThings::Update();
|
||||||
|
CWaterCannons::Update();
|
||||||
|
CUserDisplay::Process();
|
||||||
|
CReplay::Update();
|
||||||
|
CWorld::Process();
|
||||||
|
gAccidentManager.Update();
|
||||||
|
CPacManPickups::Update();
|
||||||
|
CPickups::Update();
|
||||||
|
CGarages::Update();
|
||||||
|
CRubbish::Update();
|
||||||
|
CSpecialFX::Update();
|
||||||
|
CTimeCycle::Update();
|
||||||
|
if (CReplay::ShouldStandardCameraBeProcessed())
|
||||||
|
TheCamera.Process();
|
||||||
|
CCullZones::Update();
|
||||||
|
if (!CReplay::IsPlayingBack())
|
||||||
|
CGameLogic::Update();
|
||||||
|
CBridge::Update();
|
||||||
|
CCoronas::DoSunAndMoon();
|
||||||
|
CCoronas::Update();
|
||||||
|
CShadows::UpdateStaticShadows();
|
||||||
|
CShadows::UpdatePermanentShadows();
|
||||||
|
gPhoneInfo.Update();
|
||||||
|
if (!CReplay::IsPlayingBack())
|
||||||
|
{
|
||||||
|
CCarCtrl::GenerateRandomCars();
|
||||||
|
CRoadBlocks::GenerateRoadBlocks();
|
||||||
|
CCarCtrl::RemoveDistantCars();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void CGame::ReloadIPLs(void)
|
||||||
|
{
|
||||||
|
CTimer::Stop();
|
||||||
|
CWorld::RemoveStaticObjects();
|
||||||
|
ThePaths.Init();
|
||||||
|
CCullZones::Init();
|
||||||
|
CFileLoader::ReloadPaths("GTA3.IDE");
|
||||||
|
CFileLoader::LoadScene("INDUST.IPL");
|
||||||
|
CFileLoader::LoadScene("COMMER.IPL");
|
||||||
|
CFileLoader::LoadScene("SUBURBAN.IPL");
|
||||||
|
CFileLoader::LoadScene("CULL.IPL");
|
||||||
|
ThePaths.PreparePathData();
|
||||||
|
CTrafficLights::ScanForLightsOnMap();
|
||||||
|
CRoadBlocks::Init();
|
||||||
|
CCranes::InitCranes();
|
||||||
|
CGarages::Init();
|
||||||
|
CWorld::RepositionCertainDynamicObjects();
|
||||||
|
CCullZones::ResolveVisibilities();
|
||||||
|
CRenderer::SortBIGBuildings();
|
||||||
|
CTimer::Update();
|
||||||
|
}
|
||||||
|
|
||||||
WRAPPER bool CGame::InitialiseRenderWare(void) { EAXJMP(0x48BBA0); }
|
WRAPPER bool CGame::InitialiseRenderWare(void) { EAXJMP(0x48BBA0); }
|
||||||
WRAPPER void CGame::ShutdownRenderWare(void) { EAXJMP(0x48BCB0); }
|
WRAPPER void CGame::ShutdownRenderWare(void) { EAXJMP(0x48BCB0); }
|
||||||
@ -36,3 +182,7 @@ WRAPPER void CGame::ShutDown(void) { EAXJMP(0x48C3A0); }
|
|||||||
WRAPPER void CGame::ShutDownForRestart(void) { EAXJMP(0x48C6B0); }
|
WRAPPER void CGame::ShutDownForRestart(void) { EAXJMP(0x48C6B0); }
|
||||||
WRAPPER void CGame::InitialiseWhenRestarting(void) { EAXJMP(0x48C740); }
|
WRAPPER void CGame::InitialiseWhenRestarting(void) { EAXJMP(0x48C740); }
|
||||||
WRAPPER bool CGame::InitialiseOnceAfterRW(void) { EAXJMP(0x48BD50); }
|
WRAPPER bool CGame::InitialiseOnceAfterRW(void) { EAXJMP(0x48BD50); }
|
||||||
|
|
||||||
|
STARTPATCHES
|
||||||
|
InjectHook(0x48C850, CGame::Process, PATCH_JUMP);
|
||||||
|
ENDPATCHES
|
||||||
|
@ -30,6 +30,7 @@ public:
|
|||||||
static void FinalShutdown(void);
|
static void FinalShutdown(void);
|
||||||
static void ShutDownForRestart(void);
|
static void ShutDownForRestart(void);
|
||||||
static void Process(void);
|
static void Process(void);
|
||||||
|
static void ReloadIPLs(void);
|
||||||
|
|
||||||
// NB: these do something on PS2
|
// NB: these do something on PS2
|
||||||
static void TidyUpMemory(bool, bool) {}
|
static void TidyUpMemory(bool, bool) {}
|
||||||
|
@ -15,6 +15,8 @@ CCurrentVehicle& CUserDisplay::CurrentVehicle = *(CCurrentVehicle*)0x8F5FE8;
|
|||||||
|
|
||||||
WRAPPER void CPager::AddMessage(wchar*, uint16, uint16, uint16) { EAXJMP(0x52B940); }
|
WRAPPER void CPager::AddMessage(wchar*, uint16, uint16, uint16) { EAXJMP(0x52B940); }
|
||||||
|
|
||||||
|
WRAPPER void CUserDisplay::Process(void) { EAXJMP(0x4AD690); }
|
||||||
|
|
||||||
void COnscreenTimer::Init() {
|
void COnscreenTimer::Init() {
|
||||||
m_bDisabled = false;
|
m_bDisabled = false;
|
||||||
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
|
for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
|
||||||
|
@ -63,4 +63,6 @@ public:
|
|||||||
static COnscreenTimer &OnscnTimer;
|
static COnscreenTimer &OnscnTimer;
|
||||||
static CPager &Pager;
|
static CPager &Pager;
|
||||||
static CCurrentVehicle &CurrentVehicle;
|
static CCurrentVehicle &CurrentVehicle;
|
||||||
|
|
||||||
|
static void Process(void);
|
||||||
};
|
};
|
||||||
|
@ -39,6 +39,8 @@ bool &CWorld::bDoingCarCollisions = *(bool*)0x95CD8C;
|
|||||||
bool &CWorld::bIncludeCarTyres = *(bool*)0x95CDAA;
|
bool &CWorld::bIncludeCarTyres = *(bool*)0x95CDAA;
|
||||||
|
|
||||||
WRAPPER void CWorld::ShutDown(void) { EAXJMP(0x4AE450); }
|
WRAPPER void CWorld::ShutDown(void) { EAXJMP(0x4AE450); }
|
||||||
|
WRAPPER void CWorld::RepositionCertainDynamicObjects() { EAXJMP(0x4B42B0); }
|
||||||
|
WRAPPER void CWorld::RemoveStaticObjects() { EAXJMP(0x4B4D50); }
|
||||||
WRAPPER void CWorld::RemoveReferencesToDeletedObject(CEntity*) { EAXJMP(0x4B3BF0); }
|
WRAPPER void CWorld::RemoveReferencesToDeletedObject(CEntity*) { EAXJMP(0x4B3BF0); }
|
||||||
WRAPPER void CWorld::FindObjectsKindaColliding(const CVector &, float, bool, int16*, int16, CEntity **, bool, bool, bool, bool, bool){ EAXJMP(0x4B2A30); }
|
WRAPPER void CWorld::FindObjectsKindaColliding(const CVector &, float, bool, int16*, int16, CEntity **, bool, bool, bool, bool, bool){ EAXJMP(0x4B2A30); }
|
||||||
WRAPPER void CWorld::ClearExcitingStuffFromArea(const CVector &pos, float radius, uint8) { EAXJMP(0x4B4E70) };
|
WRAPPER void CWorld::ClearExcitingStuffFromArea(const CVector &pos, float radius, uint8) { EAXJMP(0x4B4E70) };
|
||||||
|
@ -122,6 +122,8 @@ public:
|
|||||||
|
|
||||||
static void Initialise();
|
static void Initialise();
|
||||||
static void ShutDown();
|
static void ShutDown();
|
||||||
|
static void RepositionCertainDynamicObjects();
|
||||||
|
static void RemoveStaticObjects();
|
||||||
static void Process();
|
static void Process();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -17,3 +17,4 @@ CGlass::WindowRespondsToSoftCollision(CEntity *ent, float amount)
|
|||||||
}
|
}
|
||||||
|
|
||||||
WRAPPER void CGlass::Render(void) { EAXJMP(0x502350); }
|
WRAPPER void CGlass::Render(void) { EAXJMP(0x502350); }
|
||||||
|
WRAPPER void CGlass::Update(void) { EAXJMP(0x502050); }
|
||||||
|
@ -9,4 +9,5 @@ public:
|
|||||||
static void WindowRespondsToCollision(CEntity *ent, float amount, CVector speed, CVector point, bool foo);
|
static void WindowRespondsToCollision(CEntity *ent, float amount, CVector speed, CVector point, bool foo);
|
||||||
static void WindowRespondsToSoftCollision(CEntity *ent, float amount);
|
static void WindowRespondsToSoftCollision(CEntity *ent, float amount);
|
||||||
static void Render(void);
|
static void Render(void);
|
||||||
|
static void Update(void);
|
||||||
};
|
};
|
||||||
|
@ -4,3 +4,4 @@
|
|||||||
|
|
||||||
WRAPPER void CRubbish::Render(void) { EAXJMP(0x512190); }
|
WRAPPER void CRubbish::Render(void) { EAXJMP(0x512190); }
|
||||||
WRAPPER void CRubbish::StirUp(CVehicle *veh) { EAXJMP(0x512690); }
|
WRAPPER void CRubbish::StirUp(CVehicle *veh) { EAXJMP(0x512690); }
|
||||||
|
WRAPPER void CRubbish::Update(void) { EAXJMP(0x511B90); }
|
||||||
|
@ -7,4 +7,5 @@ class CRubbish
|
|||||||
public:
|
public:
|
||||||
static void Render(void);
|
static void Render(void);
|
||||||
static void StirUp(CVehicle *veh); // CAutomobile on PS2
|
static void StirUp(CVehicle *veh); // CAutomobile on PS2
|
||||||
|
static void Update(void);
|
||||||
};
|
};
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include "Skidmarks.h"
|
#include "Skidmarks.h"
|
||||||
|
|
||||||
WRAPPER void CSkidmarks::Clear(void) { EAXJMP(0x518130); }
|
WRAPPER void CSkidmarks::Clear(void) { EAXJMP(0x518130); }
|
||||||
|
WRAPPER void CSkidmarks::Update() { EAXJMP(0x518200); }
|
||||||
|
|
||||||
WRAPPER void CSkidmarks::Render(void) { EAXJMP(0x5182E0); }
|
WRAPPER void CSkidmarks::Render(void) { EAXJMP(0x5182E0); }
|
||||||
WRAPPER void CSkidmarks::RegisterOne(uint32 id, CVector pos, float fwdx, float fwdY, bool *isMuddy, bool *isBloddy) { EAXJMP(0x5185C0); }
|
WRAPPER void CSkidmarks::RegisterOne(uint32 id, CVector pos, float fwdx, float fwdY, bool *isMuddy, bool *isBloddy) { EAXJMP(0x5185C0); }
|
||||||
|
@ -4,6 +4,7 @@ class CSkidmarks
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static void Clear(void);
|
static void Clear(void);
|
||||||
|
static void Update(void);
|
||||||
static void Render(void);
|
static void Render(void);
|
||||||
static void RegisterOne(uint32 id, CVector pos, float fwdx, float fwdY, bool *isMuddy, bool *isBloddy);
|
static void RegisterOne(uint32 id, CVector pos, float fwdx, float fwdY, bool *isMuddy, bool *isBloddy);
|
||||||
};
|
};
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#include "Text.h"
|
#include "Text.h"
|
||||||
|
|
||||||
WRAPPER void CSpecialFX::Render(void) { EAXJMP(0x518DC0); }
|
WRAPPER void CSpecialFX::Render(void) { EAXJMP(0x518DC0); }
|
||||||
|
WRAPPER void CSpecialFX::Update(void) { EAXJMP(0x518D40); }
|
||||||
|
|
||||||
WRAPPER void CMotionBlurStreaks::RegisterStreak(int32 id, uint8 r, uint8 g, uint8 b, CVector p1, CVector p2) { EAXJMP(0x519460); }
|
WRAPPER void CMotionBlurStreaks::RegisterStreak(int32 id, uint8 r, uint8 g, uint8 b, CVector p1, CVector p2) { EAXJMP(0x519460); }
|
||||||
|
|
||||||
|
@ -4,6 +4,7 @@ class CSpecialFX
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static void Render(void);
|
static void Render(void);
|
||||||
|
static void Update(void);
|
||||||
};
|
};
|
||||||
|
|
||||||
class CMotionBlurStreaks
|
class CMotionBlurStreaks
|
||||||
|
@ -2,5 +2,6 @@
|
|||||||
#include "patcher.h"
|
#include "patcher.h"
|
||||||
#include "WaterCannon.h"
|
#include "WaterCannon.h"
|
||||||
|
|
||||||
|
WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); }
|
||||||
WRAPPER void CWaterCannons::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); }
|
WRAPPER void CWaterCannons::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); }
|
||||||
WRAPPER void CWaterCannons::Render(void) { EAXJMP(0x522550); }
|
WRAPPER void CWaterCannons::Render(void) { EAXJMP(0x522550); }
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
class CWaterCannons
|
class CWaterCannons
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
static void Update(void);
|
||||||
static void UpdateOne(uint32 id, CVector *pos, CVector *dir);
|
static void UpdateOne(uint32 id, CVector *pos, CVector *dir);
|
||||||
static void Render(void);
|
static void Render(void);
|
||||||
};
|
};
|
||||||
|
@ -28,6 +28,7 @@ bool &CWeather::bScriptsForceRain = *(bool*)0x95CD7D;
|
|||||||
bool &CWeather::Stored_StateStored = *(bool*)0x95CDC1;
|
bool &CWeather::Stored_StateStored = *(bool*)0x95CDC1;
|
||||||
|
|
||||||
WRAPPER void CWeather::RenderRainStreaks(void) { EAXJMP(0x524550); }
|
WRAPPER void CWeather::RenderRainStreaks(void) { EAXJMP(0x524550); }
|
||||||
|
WRAPPER void CWeather::Update(void) { EAXJMP(0x522C10); }
|
||||||
|
|
||||||
void CWeather::ReleaseWeather()
|
void CWeather::ReleaseWeather()
|
||||||
{
|
{
|
||||||
|
@ -34,6 +34,7 @@ public:
|
|||||||
static bool &Stored_StateStored;
|
static bool &Stored_StateStored;
|
||||||
|
|
||||||
static void RenderRainStreaks(void);
|
static void RenderRainStreaks(void);
|
||||||
|
static void Update(void);
|
||||||
|
|
||||||
static void ReleaseWeather();
|
static void ReleaseWeather();
|
||||||
static void ForceWeather(int16);
|
static void ForceWeather(int16);
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "Ped.h"
|
#include "Ped.h"
|
||||||
#include "World.h"
|
#include "World.h"
|
||||||
|
|
||||||
|
WRAPPER void CWeapon::UpdateWeapons(void) { EAXJMP(0x55C310); }
|
||||||
WRAPPER bool CWeapon::Fire(CEntity*, CVector*) { EAXJMP(0x55C380); }
|
WRAPPER bool CWeapon::Fire(CEntity*, CVector*) { EAXJMP(0x55C380); }
|
||||||
WRAPPER void CWeapon::FireFromCar(CAutomobile *car, bool left) { EAXJMP(0x55C940); }
|
WRAPPER void CWeapon::FireFromCar(CAutomobile *car, bool left) { EAXJMP(0x55C940); }
|
||||||
WRAPPER void CWeapon::AddGunshell(CEntity*, CVector const&, CVector2D const&, float) { EAXJMP(0x55F770); }
|
WRAPPER void CWeapon::AddGunshell(CEntity*, CVector const&, CVector2D const&, float) { EAXJMP(0x55F770); }
|
||||||
|
@ -73,5 +73,6 @@ public:
|
|||||||
static void DoTankDoomAiming(CEntity *playerVehicle, CEntity *playerPed, CVector *start, CVector *end);
|
static void DoTankDoomAiming(CEntity *playerVehicle, CEntity *playerPed, CVector *start, CVector *end);
|
||||||
bool HitsGround(CEntity* holder, CVector* firePos, CEntity* aimingTo);
|
bool HitsGround(CEntity* holder, CVector* firePos, CEntity* aimingTo);
|
||||||
static void InitialiseWeapons(void);
|
static void InitialiseWeapons(void);
|
||||||
|
static void UpdateWeapons(void);
|
||||||
};
|
};
|
||||||
static_assert(sizeof(CWeapon) == 0x18, "CWeapon: error");
|
static_assert(sizeof(CWeapon) == 0x18, "CWeapon: error");
|
||||||
|
Loading…
Reference in New Issue
Block a user