summaryrefslogtreecommitdiffstats
path: root/src/User.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-12 11:18:11 +0200
committerGitHub <noreply@github.com>2019-06-12 11:18:11 +0200
commita375709eeb66b8013da3c1efbfff850d36e4b9c9 (patch)
treef7dceb2aee62bc40554b69a6c0c3051371e4ddc2 /src/User.cpp
parentanimation fixes (diff)
parentAdd NUMONSCREENTIMERENTRIES in config.h (diff)
downloadre3-a375709eeb66b8013da3c1efbfff850d36e4b9c9.tar
re3-a375709eeb66b8013da3c1efbfff850d36e4b9c9.tar.gz
re3-a375709eeb66b8013da3c1efbfff850d36e4b9c9.tar.bz2
re3-a375709eeb66b8013da3c1efbfff850d36e4b9c9.tar.lz
re3-a375709eeb66b8013da3c1efbfff850d36e4b9c9.tar.xz
re3-a375709eeb66b8013da3c1efbfff850d36e4b9c9.tar.zst
re3-a375709eeb66b8013da3c1efbfff850d36e4b9c9.zip
Diffstat (limited to '')
-rw-r--r--src/User.cpp177
1 files changed, 171 insertions, 6 deletions
diff --git a/src/User.cpp b/src/User.cpp
index 4cdb0f1b..c36f62eb 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 < NUMONSCREENTIMERENTRIES; 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 < NUMONSCREENTIMERENTRIES; i++) {
+ m_sEntries[i].Process();
+ }
+ }
+}
+
+void COnscreenTimer::ProcessForDisplay() {
+ if(CHud::m_Wants_To_Draw_Hud) {
+ m_bProcessed = false;
+ for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
+ if(m_sEntries[i].ProcessForDisplay()) {
+ m_bProcessed = true;
+ }
+ }
+ }
+}
+
+void COnscreenTimer::ClearCounter(uint32 offset) {
+ 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;
+ m_sEntries[i].m_nType = 0;
+ m_sEntries[i].m_bCounterProcessed = 0;
+ }
+ }
+}
+
+void COnscreenTimer::ClearClock(uint32 offset) {
+ 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;
+ m_sEntries[i].m_bTimerProcessed = 0;
+ }
+ }
+}
+
+void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) {
+ uint32 i = 0;
+ for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; 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 < NUMONSCREENTIMERENTRIES; 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