Merge pull request #352 from Nick007J/master

CGame::Initialise
This commit is contained in:
aap 2020-03-23 00:34:41 +01:00 committed by GitHub
commit 4070cad4a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 383 additions and 131 deletions

View File

@ -7,6 +7,7 @@ uint16 &CRecordDataForGame::RecordingState = *(uint16*)0x95CC24;
uint8 &CRecordDataForChase::Status = *(uint8*)0x95CDCE; uint8 &CRecordDataForChase::Status = *(uint8*)0x95CDCE;
WRAPPER void CRecordDataForGame::SaveOrRetrieveDataForThisFrame(void) { EAXJMP(0x4341F0); } WRAPPER void CRecordDataForGame::SaveOrRetrieveDataForThisFrame(void) { EAXJMP(0x4341F0); }
WRAPPER void CRecordDataForGame::Init(void) { EAXJMP(0x4340F0); }
WRAPPER void CRecordDataForChase::SaveOrRetrieveDataForThisFrame(void) { EAXJMP(0x4347F0); } WRAPPER void CRecordDataForChase::SaveOrRetrieveDataForThisFrame(void) { EAXJMP(0x4347F0); }
WRAPPER void CRecordDataForChase::ProcessControlCars(void) { EAXJMP(0x435540); } WRAPPER void CRecordDataForChase::ProcessControlCars(void) { EAXJMP(0x435540); }
@ -15,3 +16,4 @@ WRAPPER void CRecordDataForChase::StartChaseScene(float) { EAXJMP(0x435690); }
WRAPPER void CRecordDataForChase::CleanUpChaseScene() { EAXJMP(0x4357C0); } WRAPPER void CRecordDataForChase::CleanUpChaseScene() { EAXJMP(0x4357C0); }
WRAPPER void CRecordDataForChase::RemoveCarFromChase(int32) { EAXJMP(0x435BC0); } WRAPPER void CRecordDataForChase::RemoveCarFromChase(int32) { EAXJMP(0x435BC0); }
WRAPPER CVehicle* CRecordDataForChase::TurnChaseCarIntoScriptCar(int32) { EAXJMP(0x435C00); } WRAPPER CVehicle* CRecordDataForChase::TurnChaseCarIntoScriptCar(int32) { EAXJMP(0x435C00); }
WRAPPER void CRecordDataForChase::Init(void) { EAXJMP(0x434780); }

View File

@ -20,6 +20,7 @@ public:
static void CleanUpChaseScene(); static void CleanUpChaseScene();
static void RemoveCarFromChase(int32); static void RemoveCarFromChase(int32);
static CVehicle* TurnChaseCarIntoScriptCar(int32); static CVehicle* TurnChaseCarIntoScriptCar(int32);
static void Init(void);
}; };
@ -29,4 +30,5 @@ public:
static uint16 &RecordingState; static uint16 &RecordingState;
static void SaveOrRetrieveDataForThisFrame(void); static void SaveOrRetrieveDataForThisFrame(void);
static void Init(void);
}; };

View File

@ -3,3 +3,4 @@
#include "SceneEdit.h" #include "SceneEdit.h"
WRAPPER void CSceneEdit::Update(void) { EAXJMP(0x585570); } WRAPPER void CSceneEdit::Update(void) { EAXJMP(0x585570); }
WRAPPER void CSceneEdit::Init(void) { EAXJMP(0x585170); }

View File

@ -4,4 +4,5 @@ class CSceneEdit
{ {
public: public:
static void Update(void); static void Update(void);
static void Init(void);
}; };

12
src/core/Debug.cpp Normal file
View File

@ -0,0 +1,12 @@
#include "Debug.h"
int CDebug::ms_nCurrentTextLine;
void CDebug::DebugInitTextBuffer()
{
ms_nCurrentTextLine = 0;
}
void CDebug::DebugDisplayTextBuffer()
{
}

11
src/core/Debug.h Normal file
View File

@ -0,0 +1,11 @@
#pragma once
class CDebug
{
static int ms_nCurrentTextLine;
public:
static void DebugInitTextBuffer();
static void DebugDisplayTextBuffer();
};

View File

@ -12,10 +12,13 @@
#include "Clock.h" #include "Clock.h"
#include "Clouds.h" #include "Clouds.h"
#include "Collision.h" #include "Collision.h"
#include "Console.h"
#include "Coronas.h" #include "Coronas.h"
#include "Cranes.h" #include "Cranes.h"
#include "Credits.h"
#include "CutsceneMgr.h" #include "CutsceneMgr.h"
#include "Darkel.h" #include "Darkel.h"
#include "Debug.h"
#include "EventList.h" #include "EventList.h"
#include "FileLoader.h" #include "FileLoader.h"
#include "FileMgr.h" #include "FileMgr.h"
@ -27,6 +30,8 @@
#include "Garages.h" #include "Garages.h"
#include "Glass.h" #include "Glass.h"
#include "Heli.h" #include "Heli.h"
#include "IniFile.h"
#include "Messages.h"
#include "Pad.h" #include "Pad.h"
#include "Particle.h" #include "Particle.h"
#include "Phones.h" #include "Phones.h"
@ -36,14 +41,18 @@
#include "Record.h" #include "Record.h"
#include "Renderer.h" #include "Renderer.h"
#include "Replay.h" #include "Replay.h"
#include "Restart.h"
#include "RoadBlocks.h" #include "RoadBlocks.h"
#include "PedRoutes.h"
#include "Rubbish.h" #include "Rubbish.h"
#include "RwHelper.h"
#include "SceneEdit.h" #include "SceneEdit.h"
#include "Script.h" #include "Script.h"
#include "Shadows.h" #include "Shadows.h"
#include "Skidmarks.h" #include "Skidmarks.h"
#include "SpecialFX.h" #include "SpecialFX.h"
#include "Sprite2d.h" #include "Sprite2d.h"
#include "Stats.h"
#include "Streaming.h" #include "Streaming.h"
#include "TimeCycle.h" #include "TimeCycle.h"
#include "TrafficLights.h" #include "TrafficLights.h"
@ -51,7 +60,9 @@
#include "TxdStore.h" #include "TxdStore.h"
#include "User.h" #include "User.h"
#include "WaterCannon.h" #include "WaterCannon.h"
#include "WaterLevel.h"
#include "Weapon.h" #include "Weapon.h"
#include "WeaponEffects.h"
#include "Weather.h" #include "Weather.h"
#include "World.h" #include "World.h"
#include "ZoneCull.h" #include "ZoneCull.h"
@ -76,7 +87,151 @@ CGame::InitialiseOnceBeforeRW(void)
return true; return true;
} }
WRAPPER void CGame::Initialise(const char *datFile) { EAXJMP(0x48BED0); } int &gameTxdSlot = *(int*)0x628D88;
bool CGame::Initialise(const char* datFile)
{
ResetLoadingScreenBar();
strcpy(aDatFile, datFile);
CPools::Initialise();
CIniFile::LoadIniFile();
currLevel = LEVEL_INDUSTRIAL;
LoadingScreen("Loading the Game", "Loading generic textures", GetRandomSplashScreen());
gameTxdSlot = CTxdStore::AddTxdSlot("generic");
CTxdStore::Create(gameTxdSlot);
CTxdStore::AddRef(gameTxdSlot);
LoadingScreen("Loading the Game", "Loading particles", nil);
int particleTxdSlot = CTxdStore::AddTxdSlot("particle");
CTxdStore::LoadTxd(particleTxdSlot, "MODELS/PARTICLE.TXD");
CTxdStore::AddRef(particleTxdSlot);
CTxdStore::SetCurrentTxd(gameTxdSlot);
LoadingScreen("Loading the Game", "Setup game variables", nil);
CGameLogic::InitAtStartOfGame();
CReferences::Init();
TheCamera.Init();
TheCamera.SetRwCamera(Scene.camera);
CDebug::DebugInitTextBuffer();
ThePaths.Init();
ThePaths.AllocatePathFindInfoMem(4500);
CWeather::Init();
CCullZones::Init();
CCollision::Init();
CTheZones::Init();
CUserDisplay::Init();
CMessages::Init();
CMessages::ClearAllMessagesDisplayedByGame();
CRecordDataForGame::Init();
CRestart::Initialise();
CWorld::Initialise();
CParticle::Initialise();
CAnimManager::Initialise();
CCutsceneMgr::Initialise();
CCarCtrl::Init();
InitModelIndices();
CModelInfo::Initialise();
CPickups::Init();
CTheCarGenerators::Init();
CdStreamAddImage("MODELS\\GTA3.IMG");
CFileLoader::LoadLevel("DATA\\DEFAULT.DAT");
CFileLoader::LoadLevel(datFile);
CWorld::AddParticles();
CVehicleModelInfo::LoadVehicleColours();
CVehicleModelInfo::LoadEnvironmentMaps();
CTheZones::PostZoneCreation();
LoadingScreen("Loading the Game", "Setup paths", GetRandomSplashScreen());
ThePaths.PreparePathData();
for (int i = 0; i < NUMPLAYERS; i++)
CWorld::Players[i].Clear();
CWorld::Players[0].LoadPlayerSkin();
TestModelIndices();
LoadingScreen("Loading the Game", "Setup water", nil);
CWaterLevel::Initialise("DATA\\WATER.DAT");
TheConsole.Init();
CDraw::SetFOV(120.0f);
CDraw::ms_fLODDistance = 500.0f;
LoadingScreen("Loading the Game", "Setup streaming", nil);
int txdHandle = CFileMgr::OpenFile("MODELS\\TXD.IMG", "r");
if (txdHandle)
CFileMgr::CloseFile(txdHandle);
if (!CheckVideoCardCaps() && txdHandle) {
CdStreamAddImage("MODELS\\TXD.IMG");
CStreaming::Init();
} else {
CStreaming::Init();
if (ConvertTextures()) {
CStreaming::Shutdown();
CdStreamAddImage("MODELS\\TXD.IMG");
CStreaming::Init();
}
}
CStreaming::LoadInitialVehicles();
CStreaming::LoadInitialPeds();
CStreaming::RequestBigBuildings(LEVEL_NONE);
CStreaming::LoadAllRequestedModels(false);
printf("Streaming uses %dK of its memory", CStreaming::ms_memoryUsed / 1024);
LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen());
CAnimManager::LoadAnimFiles();
CPed::Initialise();
CRouteNode::Initialise();
CEventList::Initialise();
LoadingScreen("Loading the Game", "Find big buildings", nil);
CRenderer::Init();
LoadingScreen("Loading the Game", "Setup game variables", nil);
CRadar::Initialise();
CRadar::LoadTextures();
CWeapon::InitialiseWeapons();
LoadingScreen("Loading the Game", "Setup traffic lights", nil);
CTrafficLights::ScanForLightsOnMap();
CRoadBlocks::Init();
LoadingScreen("Loading the Game", "Setup game variables", nil);
CPopulation::Initialise();
CWorld::PlayerInFocus = 0;
CCoronas::Init();
CShadows::Init();
CWeaponEffects::Init();
CSkidmarks::Init();
CAntennas::Init();
CGlass::Init();
gPhoneInfo.Initialise();
CSceneEdit::Init();
LoadingScreen("Loading the Game", "Load scripts", nil);
CTheScripts::Init();
CGangs::Initialize();
LoadingScreen("Loading the Game", "Setup game variables", nil);
CClock::Initialise(1000);
CHeli::InitHelis();
CCranes::InitCranes();
CMovingThings::Init();
CDarkel::Init();
CStats::Init();
CPacManPickups::Init();
CRubbish::Init();
CClouds::Init();
CSpecialFX::Init();
CWaterCannons::Init();
CBridge::Init();
CGarages::Init();
LoadingScreen("Loading the Game", "Position dynamic objects", nil);
CWorld::RepositionCertainDynamicObjects();
LoadingScreen("Loading the Game", "Initialise vehicle paths", nil);
CCullZones::ResolveVisibilities();
CTrain::InitTrains();
CPlane::InitPlanes();
CCredits::Init();
CRecordDataForChase::Init();
CReplay::Init();
LoadingScreen("Loading the Game", "Start script", nil);
CTheScripts::StartTestScript();
CTheScripts::Process();
TheCamera.Process();
LoadingScreen("Loading the Game", "Load scene", nil);
CModelInfo::RemoveColModelsFromOtherLevels(CGame::currLevel);
CCollision::ms_collisionInMemory = CGame::currLevel;
for (int i = 0; i < MAX_PADS; i++)
CPad::GetPad(i)->Clear(true);
return true;
}
#if 0 #if 0
WRAPPER void CGame::Process(void) { EAXJMP(0x48C850); } WRAPPER void CGame::Process(void) { EAXJMP(0x48C850); }
#else #else

View File

@ -20,7 +20,7 @@ public:
static bool &playingIntro; static bool &playingIntro;
static char *aDatFile; //[32]; static char *aDatFile; //[32];
static void Initialise(const char *datFile); static bool Initialise(const char *datFile);
static bool InitialiseOnceBeforeRW(void); static bool InitialiseOnceBeforeRW(void);
static bool InitialiseRenderWare(void); static bool InitialiseRenderWare(void);
static bool InitialiseOnceAfterRW(void); static bool InitialiseOnceAfterRW(void);

View File

@ -347,6 +347,13 @@ CameraCreate(RwInt32 width, RwInt32 height, RwBool zBuffer)
return (nil); return (nil);
} }
WRAPPER void ReadVideoCardCapsFile(uint32&, uint32&, uint32&, uint32&) { EAXJMP(0x5926C0); }
WRAPPER bool CheckVideoCardCaps(void) { EAXJMP(0x592740); }
WRAPPER void WriteVideoCardCapsFile(void) { EAXJMP(0x5927D0); }
WRAPPER void ConvertingTexturesScreen(uint32, uint32, const char*) { EAXJMP(0x592880); }
WRAPPER void DealWithTxdWriteError(uint32, uint32, const char*) { EAXJMP(0x592BF0); }
WRAPPER bool ConvertTextures() { EAXJMP(0x592C70); }
STARTPATCHES STARTPATCHES
//InjectHook(0x526450, GetFirstObjectCallback, PATCH_JUMP); //InjectHook(0x526450, GetFirstObjectCallback, PATCH_JUMP);
InjectHook(0x526460, GetFirstObject, PATCH_JUMP); InjectHook(0x526460, GetFirstObject, PATCH_JUMP);

View File

@ -12,6 +12,12 @@ RwTexture *GetFirstTexture(RwTexDictionary *txd);
RwTexDictionary *RwTexDictionaryGtaStreamRead(RwStream *stream); RwTexDictionary *RwTexDictionaryGtaStreamRead(RwStream *stream);
RwTexDictionary *RwTexDictionaryGtaStreamRead1(RwStream *stream); RwTexDictionary *RwTexDictionaryGtaStreamRead1(RwStream *stream);
RwTexDictionary *RwTexDictionaryGtaStreamRead2(RwStream *stream, RwTexDictionary *texDict); RwTexDictionary *RwTexDictionaryGtaStreamRead2(RwStream *stream, RwTexDictionary *texDict);
void ReadVideoCardCapsFile(uint32&, uint32&, uint32&, uint32&);
bool CheckVideoCardCaps(void);
void WriteVideoCardCapsFile(void);
void ConvertingTexturesScreen(uint32, uint32, const char*);
void DealWithTxdWriteError(uint32, uint32, const char*);
bool ConvertTextures(); // not a real name
bool RpClumpGtaStreamRead1(RwStream *stream); bool RpClumpGtaStreamRead1(RwStream *stream);
RpClump *RpClumpGtaStreamRead2(RwStream *stream); RpClump *RpClumpGtaStreamRead2(RwStream *stream);

View File

@ -135,3 +135,5 @@ void CStats::SetTotalNumberMissions(int32 total)
{ {
TotalNumberMissions = total; TotalNumberMissions = total;
} }
WRAPPER void CStats::Init() { EAXJMP(0x4AAC60); }

View File

@ -74,4 +74,6 @@ 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);
}; };

View File

@ -27,7 +27,7 @@ uint16 &CWorld::ms_nCurrentScanCode = *(uint16*)0x95CC64;
CColPoint &CWorld::ms_testSpherePoint = *(CColPoint*)0x6E64C0; CColPoint &CWorld::ms_testSpherePoint = *(CColPoint*)0x6E64C0;
uint8 &CWorld::PlayerInFocus = *(uint8 *)0x95CD61; uint8 &CWorld::PlayerInFocus = *(uint8 *)0x95CD61;
CPlayerInfo *CWorld::Players = (CPlayerInfo *)0x9412F0; CPlayerInfo (&CWorld::Players)[NUMPLAYERS] = *(CPlayerInfo (*)[NUMPLAYERS])*(uintptr*)0x9412F0;
bool &CWorld::bNoMoreCollisionTorque = *(bool*)0x95CDCC; bool &CWorld::bNoMoreCollisionTorque = *(bool*)0x95CDCC;
CEntity *&CWorld::pIgnoreEntity = *(CEntity**)0x8F6494; CEntity *&CWorld::pIgnoreEntity = *(CEntity**)0x8F6494;
bool &CWorld::bIncludeDeadPeds = *(bool*)0x95CD8F; bool &CWorld::bIncludeDeadPeds = *(bool*)0x95CD8F;
@ -38,6 +38,7 @@ bool &CWorld::bProcessCutsceneOnly = *(bool*)0x95CD8B;
bool &CWorld::bDoingCarCollisions = *(bool*)0x95CD8C; bool &CWorld::bDoingCarCollisions = *(bool*)0x95CD8C;
bool &CWorld::bIncludeCarTyres = *(bool*)0x95CDAA; bool &CWorld::bIncludeCarTyres = *(bool*)0x95CDAA;
WRAPPER void CWorld::AddParticles(void) { EAXJMP(0x4B4010); }
WRAPPER void CWorld::ShutDown(void) { EAXJMP(0x4AE450); } WRAPPER void CWorld::ShutDown(void) { EAXJMP(0x4AE450); }
WRAPPER void CWorld::RepositionCertainDynamicObjects() { EAXJMP(0x4B42B0); } WRAPPER void CWorld::RepositionCertainDynamicObjects() { EAXJMP(0x4B42B0); }
WRAPPER void CWorld::RemoveStaticObjects() { EAXJMP(0x4B4D50); } WRAPPER void CWorld::RemoveStaticObjects() { EAXJMP(0x4B4D50); }

View File

@ -63,7 +63,7 @@ public:
static CColPoint& ms_testSpherePoint; static CColPoint& ms_testSpherePoint;
static uint8 &PlayerInFocus; static uint8 &PlayerInFocus;
static CPlayerInfo *Players; static CPlayerInfo (&Players)[NUMPLAYERS];
static CEntity *&pIgnoreEntity; static CEntity *&pIgnoreEntity;
static bool &bIncludeDeadPeds; static bool &bIncludeDeadPeds;
static bool &bNoMoreCollisionTorque; static bool &bNoMoreCollisionTorque;
@ -134,6 +134,7 @@ public:
static void ExtinguishAllCarFiresInArea(CVector, float); static void ExtinguishAllCarFiresInArea(CVector, float);
static void Initialise(); static void Initialise();
static void AddParticles();
static void ShutDown(); static void ShutDown();
static void RepositionCertainDynamicObjects(); static void RepositionCertainDynamicObjects();
static void RemoveStaticObjects(); static void RemoveStaticObjects();

View File

@ -1,6 +1,8 @@
#pragma once #pragma once
enum Config { enum Config {
NUMPLAYERS = 1,
NUMCDIMAGES = 12, // gta3.img duplicates (not used on PC) NUMCDIMAGES = 12, // gta3.img duplicates (not used on PC)
MAX_CDIMAGES = 8, // additional cdimages MAX_CDIMAGES = 8, // additional cdimages
MAX_CDCHANNELS = 5, MAX_CDCHANNELS = 5,

View File

@ -49,6 +49,7 @@
#include "Frontend.h" #include "Frontend.h"
#include "AnimViewer.h" #include "AnimViewer.h"
#include "Script.h" #include "Script.h"
#include "Debug.h"
#include "Console.h" #include "Console.h"
#define DEFAULT_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetFOV() * 0.5f))) #define DEFAULT_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetFOV() * 0.5f)))
@ -324,7 +325,7 @@ DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16
void void
DoRWStuffEndOfFrame(void) DoRWStuffEndOfFrame(void)
{ {
// CDebug::DebugDisplayTextBuffer(); CDebug::DebugDisplayTextBuffer();
// FlushObrsPrintfs(); // FlushObrsPrintfs();
RwCameraEndUpdate(Scene.camera); RwCameraEndUpdate(Scene.camera);
RsCameraShowRaster(Scene.camera); RsCameraShowRaster(Scene.camera);
@ -725,6 +726,12 @@ DestroySplashScreen(void)
float NumberOfChunksLoaded; float NumberOfChunksLoaded;
#define TOTALNUMCHUNKS 73.0f #define TOTALNUMCHUNKS 73.0f
void
ResetLoadingScreenBar()
{
NumberOfChunksLoaded = 0.0f;
}
// TODO: compare with PS2 // TODO: compare with PS2
void void
LoadingScreen(const char *str1, const char *str2, const char *splashscreen) LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
@ -792,12 +799,6 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
} }
} }
void
ResetLoadingScreenBar(void)
{
NumberOfChunksLoaded = 0.0f;
}
void void
LoadingIslandScreen(const char *levelName) LoadingIslandScreen(const char *levelName)
{ {

View File

@ -32,6 +32,7 @@ char *GetLevelSplashScreen(int level);
char *GetRandomSplashScreen(void); char *GetRandomSplashScreen(void);
void LittleTest(void); void LittleTest(void);
void ValidateVersion(); void ValidateVersion();
void ResetLoadingScreenBar(void);
#ifndef MASTER #ifndef MASTER
void TheModelViewer(void); void TheModelViewer(void);
#endif #endif

View File

@ -5,6 +5,15 @@
CRouteNode (&gaRoutes)[NUMPEDROUTES] = *(CRouteNode(*)[NUMPEDROUTES]) * (uintptr*)0x62E090; CRouteNode (&gaRoutes)[NUMPEDROUTES] = *(CRouteNode(*)[NUMPEDROUTES]) * (uintptr*)0x62E090;
void
CRouteNode::Initialise()
{
for (int i = 0; i < NUMPEDROUTES; i++) {
gaRoutes[i].m_route = -1;
gaRoutes[i].m_pos = CVector(0.0f, 0.0f, 0.0f);
}
}
int16 int16
CRouteNode::GetRouteThisPointIsOn(int16 point) CRouteNode::GetRouteThisPointIsOn(int16 point)
{ {

View File

@ -11,4 +11,5 @@ public:
static int16 GetRouteStart(int16); static int16 GetRouteStart(int16);
static void AddRoutePoint(int16, CVector); static void AddRoutePoint(int16, CVector);
static void RemoveRoute(int16); static void RemoveRoute(int16);
static void Initialise(void);
}; };

View File

@ -19,6 +19,7 @@ public:
void AddLine(char *s, uint8 r, uint8 g, uint8 b); void AddLine(char *s, uint8 r, uint8 g, uint8 b);
void AddOneLine(char *s, uint8 r, uint8 g, uint8 b); void AddOneLine(char *s, uint8 r, uint8 g, uint8 b);
void Display(); void Display();
void Init() { m_nCurrentLine = 0; m_nLineCount = 0; }
}; };
extern CConsole &TheConsole; extern CConsole &TheConsole;

View File

@ -18,3 +18,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); } WRAPPER void CGlass::Update(void) { EAXJMP(0x502050); }
WRAPPER void CGlass::Init(void) { EAXJMP(0x501F20); }

View File

@ -10,4 +10,5 @@ public:
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); static void Update(void);
static void Init(void);
}; };

View File

@ -6,3 +6,4 @@ 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); } WRAPPER void CRubbish::Update(void) { EAXJMP(0x511B90); }
WRAPPER void CRubbish::SetVisibility(bool) { EAXJMP(0x512AA0); } WRAPPER void CRubbish::SetVisibility(bool) { EAXJMP(0x512AA0); }
WRAPPER void CRubbish::Init(void) { EAXJMP(0x511940); }

View File

@ -9,4 +9,5 @@ public:
static void StirUp(CVehicle *veh); // CAutomobile on PS2 static void StirUp(CVehicle *veh); // CAutomobile on PS2
static void Update(void); static void Update(void);
static void SetVisibility(bool); static void SetVisibility(bool);
static void Init(void);
}; };

View File

@ -7,3 +7,5 @@ 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); }
WRAPPER void CSkidmarks::Init(void) { EAXJMP(0x517D70); }

View File

@ -7,4 +7,5 @@ public:
static void Update(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);
static void Init(void);
}; };

View File

@ -19,6 +19,7 @@
WRAPPER void CSpecialFX::Render(void) { EAXJMP(0x518DC0); } WRAPPER void CSpecialFX::Render(void) { EAXJMP(0x518DC0); }
WRAPPER void CSpecialFX::Update(void) { EAXJMP(0x518D40); } WRAPPER void CSpecialFX::Update(void) { EAXJMP(0x518D40); }
WRAPPER void CSpecialFX::Init(void) { EAXJMP(0x5189E0); }
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); }

View File

@ -5,6 +5,7 @@ class CSpecialFX
public: public:
static void Render(void); static void Render(void);
static void Update(void); static void Update(void);
static void Init(void);
}; };
class CMotionBlurStreaks class CMotionBlurStreaks

View File

@ -7,3 +7,4 @@ CWaterCannon (&aCannons)[NUM_WATERCANNONS] = *(CWaterCannon(*)[NUM_WATERCANNONS]
WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); } 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); }
WRAPPER void CWaterCannons::Init(void) { EAXJMP(0x522440); }

View File

@ -20,6 +20,7 @@ public:
static void Update(); static void Update();
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);
static void Init(void);
}; };
extern CWaterCannon (&aCannons)[NUM_WATERCANNONS]; extern CWaterCannon (&aCannons)[NUM_WATERCANNONS];

View File

@ -2,6 +2,8 @@
#include "patcher.h" #include "patcher.h"
#include "WeaponEffects.h" #include "WeaponEffects.h"
#include "TxdStore.h"
WRAPPER void CWeaponEffects::Render(void) { EAXJMP(0x564D70); } WRAPPER void CWeaponEffects::Render(void) { EAXJMP(0x564D70); }
CWeaponEffects &gCrossHair = *(CWeaponEffects*)0x6503BC; CWeaponEffects &gCrossHair = *(CWeaponEffects*)0x6503BC;
@ -23,3 +25,21 @@ CWeaponEffects::MarkTarget(CVector pos, uint8 red, uint8 green, uint8 blue, uint
gCrossHair.m_alpha = alpha; gCrossHair.m_alpha = alpha;
gCrossHair.m_size = size; gCrossHair.m_size = size;
} }
void
CWeaponEffects::Init()
{
gCrossHair.m_bCrosshair = false;
gCrossHair.m_vecPos = CVector(0.0f, 0.0f, 0.0f);
gCrossHair.m_red = 0;
gCrossHair.m_green = 0;
gCrossHair.m_blue = 0;
gCrossHair.m_alpha = 255;
gCrossHair.m_size = 1.0f;
gCrossHair.field_24 = 0;
CTxdStore::PushCurrentTxd();
CTxdStore::SetCurrentTxd(CTxdStore::FindTxdSlot("particle"));
gCrossHair.m_pTexture = RwTextureRead("crosshair", nil);
gCrossHair.m_pRaster = gCrossHair.m_pTexture->raster;
CTxdStore::PopCurrentTxd();
}

View File

@ -19,4 +19,5 @@ public:
static void Render(void); static void Render(void);
static void ClearCrossHair(); static void ClearCrossHair();
static void MarkTarget(CVector, uint8, uint8, uint8, uint8, float); static void MarkTarget(CVector, uint8, uint8, uint8, uint8, float);
static void Init(void);
}; };

View File

@ -34,6 +34,7 @@ float &CWeather::Stored_Rain = *(float*)0x885B4C;
WRAPPER void CWeather::RenderRainStreaks(void) { EAXJMP(0x524550); } WRAPPER void CWeather::RenderRainStreaks(void) { EAXJMP(0x524550); }
WRAPPER void CWeather::Update(void) { EAXJMP(0x522C10); } WRAPPER void CWeather::Update(void) { EAXJMP(0x522C10); }
WRAPPER void CWeather::Init(void) { EAXJMP(0x522BA0); }
void CWeather::ReleaseWeather() void CWeather::ReleaseWeather()
{ {

View File

@ -39,6 +39,7 @@ public:
static void RenderRainStreaks(void); static void RenderRainStreaks(void);
static void Update(void); static void Update(void);
static void Init(void);
static void ReleaseWeather(); static void ReleaseWeather();
static void ForceWeather(int16); static void ForceWeather(int16);