From ecd70a5f17e0aa4f6b0052c01a2170f01b125c5f Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Fri, 7 Jun 2019 22:31:03 +0200 Subject: RE more stuff from COnscreenTimer --- src/User.cpp | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 171 insertions(+), 6 deletions(-) (limited to 'src/User.cpp') 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" + +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); -WRAPPER void COnscreenTimer::ProcessForDisplay(void) { EAXJMP(0x4292E0); } +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 -- cgit v1.2.3 From bcf44d361df48ad973e77078cfe9884abc9fa60c Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Wed, 12 Jun 2019 11:08:56 +0200 Subject: Add NUMONSCREENTIMERENTRIES in config.h --- src/User.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/User.cpp') 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; } -- cgit v1.2.3