From c95f1ce2cee27b6d7d827328d51e65f3aa29162e Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Wed, 5 Jun 2019 22:32:49 +0200 Subject: [PATCH 1/4] Add GetTranslatedName to CZone --- src/Zones.cpp | 12 ++++++++++-- src/Zones.h | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Zones.cpp b/src/Zones.cpp index 0f9bedfb..d4ce07f6 100644 --- a/src/Zones.cpp +++ b/src/Zones.cpp @@ -1,9 +1,12 @@ #include "common.h" #include "patcher.h" -#include "World.h" -#include "Clock.h" + #include "Zones.h" +#include "Clock.h" +#include "Text.h" +#include "World.h" + eLevelName &CTheZones::m_CurrLevel = *(eLevelName*)0x8F2BC8; CZone *&CTheZones::m_pPlayersZone = *(CZone**)0x8F254C; int16 &CTheZones::FindIndex = *(int16*)0x95CC40; @@ -40,6 +43,10 @@ CheckZoneInfo(CZoneInfo *info) assert(info->gangThreshold[7] <= info->gangThreshold[8]); } +wchar* CZone::GetTranslatedName() { + return TheText.Get(name); +} + void CTheZones::Init(void) { @@ -615,6 +622,7 @@ CTheZones::InitialiseAudioZoneArray(void) } STARTPATCHES + InjectHook(0x4B5DD0, &CZone::GetTranslatedName, PATCH_JUMP); InjectHook(0x4B5DE0, CTheZones::Init, PATCH_JUMP); InjectHook(0x4B61D0, CTheZones::Update, PATCH_JUMP); InjectHook(0x4B6210, CTheZones::CreateZone, PATCH_JUMP); diff --git a/src/Zones.h b/src/Zones.h index 291e6f60..47a4dc47 100644 --- a/src/Zones.h +++ b/src/Zones.h @@ -27,6 +27,8 @@ public: CZone *child; CZone *parent; CZone *next; + + wchar *GetTranslatedName(); }; class CZoneInfo From ecd70a5f17e0aa4f6b0052c01a2170f01b125c5f Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Fri, 7 Jun 2019 22:31:03 +0200 Subject: [PATCH 2/4] RE more stuff from COnscreenTimer --- src/User.cpp | 177 +++++++++++++++++++++++++++++++++++++++-- src/User.h | 46 ++++++++++- src/audio/DMAudio.cpp | 2 + src/audio/DMAudio.h | 8 +- src/control/Replay.cpp | 4 +- src/control/Replay.h | 2 + src/render/Hud.cpp | 2 + src/render/Hud.h | 2 + 8 files changed, 232 insertions(+), 11 deletions(-) diff --git a/src/User.cpp b/src/User.cpp index 4cdb0f1b..21bd2ccf 100644 --- a/src/User.cpp +++ b/src/User.cpp @@ -1,10 +1,175 @@ +#include "User.h" #include "common.h" #include "patcher.h" -#include "User.h" -CPlaceName &CUserDisplay::PlaceName = *(CPlaceName*)0x8F29BC; -COnscreenTimer &CUserDisplay::OnscnTimer = *(COnscreenTimer*)0x862238; -CPager &CUserDisplay::Pager = *(CPager*)0x8F2744; -CCurrentVehicle &CUserDisplay::CurrentVehicle = *(CCurrentVehicle*)0x8F5FE8; +#include "DMAudio.h" +#include "Hud.h" +#include "Replay.h" +#include "Timer.h" -WRAPPER void COnscreenTimer::ProcessForDisplay(void) { EAXJMP(0x4292E0); } +CPlaceName& CUserDisplay::PlaceName = *(CPlaceName*)0x8F29BC; +COnscreenTimer& CUserDisplay::OnscnTimer = *(COnscreenTimer*)0x862238; +CPager& CUserDisplay::Pager = *(CPager*)0x8F2744; +CCurrentVehicle& CUserDisplay::CurrentVehicle = *(CCurrentVehicle*)0x8F5FE8; + +char* CTheScripts::ScriptSpace = (char*)0x74B248; + +int COnscreenTimer::Init() { + m_bDisabled = false; + for(uint32 i = 0; i < 1; i++) { + m_sEntries[i].m_nTimerOffset = 0; + m_sEntries[i].m_nCounterOffset = 0; + + for(uint32 j = 0; j < 10; j++) { + m_sEntries[i].m_aTimerText[j] = 0; + m_sEntries[i].m_aCounterText[j] = 0; + } + + m_sEntries[i].m_nType = 0; + m_sEntries[i].m_bTimerProcessed = 0; + m_sEntries[i].m_bCounterProcessed = 0; + } + return 1; +} + +void COnscreenTimer::Process() { + if(CReplay::Mode != 1 && !m_bDisabled) { + for(uint32 i = 0; i < 1; i++) { + m_sEntries[i].Process(); + } + } +} + +void COnscreenTimer::ProcessForDisplay() { + if(CHud::m_Wants_To_Draw_Hud) { + m_bProcessed = false; + for(uint32 i = 0; i < 1; i++) { + if(m_sEntries[i].ProcessForDisplay()) { + m_bProcessed = true; + } + } + } +} + +void COnscreenTimer::ClearCounter(uint32 offset) { + for(uint32 i = 0; i < 1; i++) { + if(offset == m_sEntries[i].m_nCounterOffset) { + m_sEntries[i].m_nCounterOffset = 0; + m_sEntries[i].m_aCounterText[0] = 0; + m_sEntries[i].m_nType = 0; + m_sEntries[i].m_bCounterProcessed = 0; + } + } +} + +void COnscreenTimer::ClearClock(uint32 offset) { + for(uint32 i = 0; i < 1; i++) { + if(offset == m_sEntries[i].m_nTimerOffset) { + m_sEntries[i].m_nTimerOffset = 0; + m_sEntries[i].m_aTimerText[0] = 0; + m_sEntries[i].m_bTimerProcessed = 0; + } + } +} + +void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) { + uint32 i = 0; + for(uint32 i = 0; i < 1; i++) { + if(m_sEntries[i].m_nCounterOffset == 0) { + break; + } + return; + } + + m_sEntries[i].m_nCounterOffset = offset; + if(text) { + strncpy((char*)m_sEntries[i].m_aCounterText, text, 10); + } else { + m_sEntries[i].m_aCounterText[0] = 0; + } + + m_sEntries[i].m_nType = type; +} + +void COnscreenTimer::AddClock(uint32 offset, char* text) { + uint32 i = 0; + for(uint32 i = 0; i < 1; i++) { + if(m_sEntries[i].m_nTimerOffset == 0) { + break; + } + return; + } + + m_sEntries[i].m_nTimerOffset = offset; + if(text) { + strncpy((char*)m_sEntries[i].m_aTimerText, text, 10u); + } else { + m_sEntries[i].m_aTimerText[0] = 0; + } +} + +void COnscreenTimerEntry::Process() { + if(m_nTimerOffset) { + uint32* timerPtr = (uint32*)&CTheScripts::ScriptSpace[m_nTimerOffset]; + uint32 oldTime = *timerPtr; + int32 newTime = int32(oldTime - uint32(20.0f * CTimer::GetTimeStep())); + if(newTime < 0) { + *timerPtr = 0; + m_bTimerProcessed = 0; + m_nTimerOffset = 0; + m_aTimerText[0] = 0; + } else { + *timerPtr = (uint32)newTime; + uint32 oldTimeSeconds = oldTime / 1000; + if(oldTimeSeconds <= 11 && newTime / 1000 != oldTimeSeconds) { + DMAudio.PlayFrontEndSound(0x93u, newTime / 1000); + } + } + } +} + +bool COnscreenTimerEntry::ProcessForDisplay() { + m_bTimerProcessed = false; + m_bCounterProcessed = false; + + if(!m_nTimerOffset && !m_nCounterOffset) { + return false; + } + + if(m_nTimerOffset) { + m_bTimerProcessed = true; + ProcessForDisplayTimer(); + } + + if(m_nCounterOffset) { + m_bCounterProcessed = true; + ProcessForDisplayCounter(); + } + return true; +} + +int COnscreenTimerEntry::ProcessForDisplayTimer() { + uint32 time = *(uint32*)&CTheScripts::ScriptSpace[m_nTimerOffset]; + return sprintf(m_bTimerBuffer, "%02d:%02d", time / 1000 / 60, + time / 1000 % 60); +} + +int COnscreenTimerEntry::ProcessForDisplayCounter() { + uint32 counter = *(uint32*)&CTheScripts::ScriptSpace[m_nCounterOffset]; + return sprintf(m_bCounterBuffer, "%d", counter); +} + +STARTPATCHES +InjectHook(0x429160, &COnscreenTimerEntry::Process, PATCH_JUMP); +InjectHook(0x429110, &COnscreenTimerEntry::ProcessForDisplay, PATCH_JUMP); +InjectHook(0x429080, &COnscreenTimerEntry::ProcessForDisplayTimer, PATCH_JUMP); +InjectHook(0x4290F0, &COnscreenTimerEntry::ProcessForDisplayCounter, PATCH_JUMP); + +InjectHook(0x429220, &COnscreenTimer::Init, PATCH_JUMP); +InjectHook(0x429320, &COnscreenTimer::Process, PATCH_JUMP); +InjectHook(0x4292E0, &COnscreenTimer::ProcessForDisplay, PATCH_JUMP); +InjectHook(0x429450, &COnscreenTimer::ClearCounter, PATCH_JUMP); +InjectHook(0x429410, &COnscreenTimer::ClearClock, PATCH_JUMP); +InjectHook(0x4293B0, &COnscreenTimer::AddCounter, PATCH_JUMP); +InjectHook(0x429350, &COnscreenTimer::AddClock, PATCH_JUMP); +ENDPATCHES diff --git a/src/User.h b/src/User.h index 9717fae0..3b88de56 100644 --- a/src/User.h +++ b/src/User.h @@ -1,11 +1,55 @@ #pragma once +#include "common.h" + +class COnscreenTimerEntry +{ +public: + uint32 m_nTimerOffset; + uint32 m_nCounterOffset; + uint8 m_aTimerText[10]; + uint8 m_aCounterText[10]; + uint16 m_nType; + char m_bCounterBuffer[42]; + char m_bTimerBuffer[42]; + bool m_bTimerProcessed; + bool m_bCounterProcessed; + + void Process(); + bool ProcessForDisplay(); + + int ProcessForDisplayTimer(); + int ProcessForDisplayCounter(); +}; + +static_assert(sizeof(COnscreenTimerEntry) == 0x74, "COnscreenTimerEntry: error"); + +class CTheScripts{ +public: + static char *ScriptSpace;//[163840] +}; + class COnscreenTimer { public: - void ProcessForDisplay(void); + COnscreenTimerEntry m_sEntries[1]; + bool m_bProcessed; + bool m_bDisabled; + char field_119[2]; + + int Init(); + void Process(); + void ProcessForDisplay(); + + void ClearCounter(uint32 offset); + void ClearClock(uint32 offset); + + void AddCounter(uint32 offset, uint16 type, char* text); + void AddClock(uint32 offset, char* text); }; +static_assert(sizeof(COnscreenTimer) == 0x78, "COnscreenTimer: error"); + class CPlaceName { }; diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp index d7b334c6..dcfdc81b 100644 --- a/src/audio/DMAudio.cpp +++ b/src/audio/DMAudio.cpp @@ -15,3 +15,5 @@ WRAPPER Bool cDMAudio::IsAudioInitialised() { EAXJMP(0x57CAB0); } WRAPPER Char cDMAudio::GetCDAudioDriveLetter() { EAXJMP(0x57CA90); } WRAPPER Bool cDMAudio::CheckForAnAudioFileOnCD() { EAXJMP(0x57CA70); } WRAPPER void cDMAudio::ChangeMusicMode(UInt8 mode) { EAXJMP(0x57CCF0); } + +WRAPPER void cDMAudio::PlayFrontEndSound(uint32, uint32) { EAXJMP(0x57CC20); } diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h index ee052dfc..91a3ff0f 100644 --- a/src/audio/DMAudio.h +++ b/src/audio/DMAudio.h @@ -9,11 +9,13 @@ public: void ReleaseDigitalHandle(void); void ReacquireDigitalHandle(void); void Service(void); - void ReportCollision(CEntity *A, CEntity *B, uint8 surfA, uint8 surfB, float impulse, float speed); - void ResetTimers(UInt32 timerval); + void ReportCollision(CEntity* A, CEntity* B, uint8 surfA, uint8 surfB, + float impulse, float speed); + void ResetTimers(UInt32 timerval); Bool IsAudioInitialised(void); Char GetCDAudioDriveLetter(void); Bool CheckForAnAudioFileOnCD(void); void ChangeMusicMode(UInt8 mode); + void PlayFrontEndSound(uint32, uint32); }; -extern cDMAudio &DMAudio; +extern cDMAudio& DMAudio; diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index 32e7dc0c..6cfbd846 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -2,4 +2,6 @@ #include "patcher.h" #include "Replay.h" -WRAPPER void CReplay::Display(void) { EAXJMP(0x595EE0); } \ No newline at end of file +uint8 &CReplay::Mode = *(uint8*)0x95CD5B; + +WRAPPER void CReplay::Display(void) { EAXJMP(0x595EE0); } diff --git a/src/control/Replay.h b/src/control/Replay.h index 77e50403..eca818d6 100644 --- a/src/control/Replay.h +++ b/src/control/Replay.h @@ -4,4 +4,6 @@ class CReplay { public: static void Display(void); + + static uint8 &Mode; }; diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index f3211fd6..0de5f5b0 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -2,5 +2,7 @@ #include "patcher.h" #include "Hud.h" +bool &CHud::m_Wants_To_Draw_Hud = *(bool*)0x95CD89; + WRAPPER void CHud::Draw(void) { EAXJMP(0x5052A0); } WRAPPER void CHud::DrawAfterFade(void) { EAXJMP(0x509030); } diff --git a/src/render/Hud.h b/src/render/Hud.h index 72d3c6ad..242acea8 100644 --- a/src/render/Hud.h +++ b/src/render/Hud.h @@ -5,4 +5,6 @@ class CHud public: static void Draw(void); static void DrawAfterFade(void); + + static bool &m_Wants_To_Draw_Hud; }; From 6f0c57d228aec4586d4062018b877b5e51e71e3a Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 12 Jun 2019 10:50:23 +0200 Subject: [PATCH 3/4] animation fixes --- README.md | 2 +- src/animation/AnimBlendAssocGroup.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5e020987..019f2ff5 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ There are a couple of things that have been reversed for other projects already that could probably be put into this project without too much effort. Again, the list is not complete: -* Animation (https://github.com/aap/iii_anim) +* ~~Animation (https://github.com/aap/iii_anim)~~ * File Loader (https://github.com/aap/librwgta/tree/master/tools/IIItest) * ... diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp index 16749504..8b0001ac 100644 --- a/src/animation/AnimBlendAssocGroup.cpp +++ b/src/animation/AnimBlendAssocGroup.cpp @@ -93,7 +93,7 @@ GetModelFromName(const char *name) for(i = 0; i < MODELINFOSIZE; i++){ mi = CModelInfo::GetModelInfo(i); - if(mi->GetRwObject() && RwObjectGetType(mi->GetRwObject()) == rpCLUMP && + if(mi && mi->GetRwObject() && RwObjectGetType(mi->GetRwObject()) == rpCLUMP && strcmpIgnoringDigits(mi->GetName(), name)) return mi; } @@ -152,6 +152,7 @@ CAnimBlendAssocGroup::CreateAssociations(const char *blockName, RpClump *clump, STARTPATCHES + InjectHook(0x4012D0, &CAnimBlendAssocGroup::DestroyAssociations, PATCH_JUMP); InjectHook(0x4013D0, (CAnimBlendAssociation *(CAnimBlendAssocGroup::*)(uint32))&CAnimBlendAssocGroup::GetAnimation, PATCH_JUMP); InjectHook(0x401300, (CAnimBlendAssociation *(CAnimBlendAssocGroup::*)(const char*))&CAnimBlendAssocGroup::GetAnimation, PATCH_JUMP); InjectHook(0x401420, (CAnimBlendAssociation *(CAnimBlendAssocGroup::*)(uint32))&CAnimBlendAssocGroup::CopyAnimation, PATCH_JUMP); From bcf44d361df48ad973e77078cfe9884abc9fa60c Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Wed, 12 Jun 2019 11:08:56 +0200 Subject: [PATCH 4/4] Add NUMONSCREENTIMERENTRIES in config.h --- src/User.cpp | 14 +++++++------- src/User.h | 2 +- src/config.h | 21 +++++++++++---------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/User.cpp b/src/User.cpp index 21bd2ccf..c36f62eb 100644 --- a/src/User.cpp +++ b/src/User.cpp @@ -16,7 +16,7 @@ char* CTheScripts::ScriptSpace = (char*)0x74B248; int COnscreenTimer::Init() { m_bDisabled = false; - for(uint32 i = 0; i < 1; i++) { + for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { m_sEntries[i].m_nTimerOffset = 0; m_sEntries[i].m_nCounterOffset = 0; @@ -34,7 +34,7 @@ int COnscreenTimer::Init() { void COnscreenTimer::Process() { if(CReplay::Mode != 1 && !m_bDisabled) { - for(uint32 i = 0; i < 1; i++) { + for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { m_sEntries[i].Process(); } } @@ -43,7 +43,7 @@ void COnscreenTimer::Process() { void COnscreenTimer::ProcessForDisplay() { if(CHud::m_Wants_To_Draw_Hud) { m_bProcessed = false; - for(uint32 i = 0; i < 1; i++) { + for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { if(m_sEntries[i].ProcessForDisplay()) { m_bProcessed = true; } @@ -52,7 +52,7 @@ void COnscreenTimer::ProcessForDisplay() { } void COnscreenTimer::ClearCounter(uint32 offset) { - for(uint32 i = 0; i < 1; i++) { + for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { if(offset == m_sEntries[i].m_nCounterOffset) { m_sEntries[i].m_nCounterOffset = 0; m_sEntries[i].m_aCounterText[0] = 0; @@ -63,7 +63,7 @@ void COnscreenTimer::ClearCounter(uint32 offset) { } void COnscreenTimer::ClearClock(uint32 offset) { - for(uint32 i = 0; i < 1; i++) { + for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { if(offset == m_sEntries[i].m_nTimerOffset) { m_sEntries[i].m_nTimerOffset = 0; m_sEntries[i].m_aTimerText[0] = 0; @@ -74,7 +74,7 @@ void COnscreenTimer::ClearClock(uint32 offset) { void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) { uint32 i = 0; - for(uint32 i = 0; i < 1; i++) { + for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { if(m_sEntries[i].m_nCounterOffset == 0) { break; } @@ -93,7 +93,7 @@ void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) { void COnscreenTimer::AddClock(uint32 offset, char* text) { uint32 i = 0; - for(uint32 i = 0; i < 1; i++) { + for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) { if(m_sEntries[i].m_nTimerOffset == 0) { break; } diff --git a/src/User.h b/src/User.h index 3b88de56..b2d0b053 100644 --- a/src/User.h +++ b/src/User.h @@ -32,7 +32,7 @@ public: class COnscreenTimer { public: - COnscreenTimerEntry m_sEntries[1]; + COnscreenTimerEntry m_sEntries[NUMONSCREENTIMERENTRIES]; bool m_bProcessed; bool m_bDisabled; char field_119[2]; diff --git a/src/config.h b/src/config.h index bf3f6572..8ef51871 100644 --- a/src/config.h +++ b/src/config.h @@ -1,7 +1,7 @@ #pragma once enum Config { - NUMCDIMAGES = 50, // was 12 + NUMCDIMAGES = 50, // was 12 MODELINFOSIZE = 5500, TXDSTORESIZE = 850, @@ -14,17 +14,17 @@ enum Config { VEHICLEMODELSIZE = 120, TWODFXSIZE = 2000, - NUMOBJECTINFO = 168, // object.dat + NUMOBJECTINFO = 168, // object.dat // Pool sizes - NUMPTRNODES = 30000, // 26000 on PS2 - NUMENTRYINFOS = 5400, // 3200 on PS2 - NUMPEDS = 140, // 90 on PS2 - NUMVEHICLES = 110, // 70 on PS2 - NUMBUILDINGS = 5500, // 4915 on PS2 + NUMPTRNODES = 30000, // 26000 on PS2 + NUMENTRYINFOS = 5400, // 3200 on PS2 + NUMPEDS = 140, // 90 on PS2 + NUMVEHICLES = 110, // 70 on PS2 + NUMBUILDINGS = 5500, // 4915 on PS2 NUMTREADABLES = 1214, NUMOBJECTS = 450, - NUMDUMMIES = 2802, // 2368 on PS2 + NUMDUMMIES = 2802, // 2368 on PS2 NUMAUDIOSCRIPTOBJECTS = 256, // Link list lengths @@ -42,7 +42,6 @@ enum Config { NUMATTRIBZONES = 288, NUMZONEINDICES = 55000, - NUMPEDSTATS = 35, NUMHANDLINGS = 57, @@ -54,7 +53,9 @@ enum Config { NUMEXTRADIRECTIONALS = 4, NUMANTENNAS = 8, NUMCORONAS = 56, - NUMPOINTLIGHTS = 32 + NUMPOINTLIGHTS = 32, + + NUMONSCREENTIMERENTRIES = 1 }; #define GTA3_1_1_PATCH