The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-11-27 03:24:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor OnscreenTimer

Browse Source
This commit is contained in:
Sergeanur 2021-07-02 10:22:34 +03:00
parent 8e6e46a919
commit ae4bfef590
1 changed files with 52 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/control/OnscreenTimer.cpp
View File

@ -9,14 +9,15 @@
#include "OnscreenTimer.h" #include "OnscreenTimer.h"
#include "Camera.h" #include "Camera.h"
void COnscreenTimer::Init() { void
COnscreenTimer::Init()
{
m_bDisabled = false; m_bDisabled = false;
for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) { for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
m_sCounters[i].m_nCounterOffset = 0; m_sCounters[i].m_nCounterOffset = 0;
for(uint32 j = 0; j < ARRAY_SIZE(m_sCounters[0].m_aCounterText); j++) { for(uint32 j = 0; j < ARRAY_SIZE(m_sCounters[0].m_aCounterText); j++)
m_sCounters[i].m_aCounterText[j] = 0; m_sCounters[i].m_aCounterText[j] = '\0';
}
m_sCounters[i].m_nType = COUNTER_DISPLAY_NUMBER; m_sCounters[i].m_nType = COUNTER_DISPLAY_NUMBER;
m_sCounters[i].m_bCounterProcessed = false; m_sCounters[i].m_bCounterProcessed = false;
@ -24,24 +25,25 @@ void COnscreenTimer::Init() {
for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) { for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) {
m_sClocks[i].m_nClockOffset = 0; m_sClocks[i].m_nClockOffset = 0;
for(uint32 j = 0; j < ARRAY_SIZE(m_sClocks[0].m_aClockText); j++) { for(uint32 j = 0; j < ARRAY_SIZE(m_sClocks[0].m_aClockText); j++)
m_sClocks[i].m_aClockText[j] = 0; m_sClocks[i].m_aClockText[j] = '\0';
}
m_sClocks[i].m_bClockProcessed = false; m_sClocks[i].m_bClockProcessed = false;
m_sClocks[i].m_bClockGoingDown = true; m_sClocks[i].m_bClockGoingDown = true;
} }
} }
void COnscreenTimer::Process() { void
if(!CReplay::IsPlayingBack() && !m_bDisabled) { COnscreenTimer::Process()
for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) { {
if(!CReplay::IsPlayingBack() && !m_bDisabled)
for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++)
m_sClocks[i].Process(); m_sClocks[i].Process();
}
}
} }
void COnscreenTimer::ProcessForDisplay() { void
COnscreenTimer::ProcessForDisplay()
{
if(CHud::m_Wants_To_Draw_Hud) { if(CHud::m_Wants_To_Draw_Hud) {
m_bProcessed = false; m_bProcessed = false;
for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) { for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) {
@ -63,67 +65,67 @@ void COnscreenTimer::ProcessForDisplay() {
} }
} }
void COnscreenTimer::ClearCounter(uint32 offset) { void
COnscreenTimer::ClearCounter(uint32 offset)
{
for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) { for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
if(offset == m_sCounters[i].m_nCounterOffset) { if(offset == m_sCounters[i].m_nCounterOffset) {
m_sCounters[i].m_nCounterOffset = 0; m_sCounters[i].m_nCounterOffset = 0;
m_sCounters[i].m_aCounterText[0] = 0; m_sCounters[i].m_aCounterText[0] = '\0';
m_sCounters[i].m_nType = COUNTER_DISPLAY_NUMBER; m_sCounters[i].m_nType = COUNTER_DISPLAY_NUMBER;
m_sCounters[i].m_bCounterProcessed = 0; m_sCounters[i].m_bCounterProcessed = false;
} }
} }
} }
void COnscreenTimer::ClearClock(uint32 offset) { void
for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) { COnscreenTimer::ClearClock(uint32 offset)
{
for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++)
if(offset == m_sClocks[i].m_nClockOffset) { if(offset == m_sClocks[i].m_nClockOffset) {
m_sClocks[i].m_nClockOffset = 0; m_sClocks[i].m_nClockOffset = 0;
m_sClocks[i].m_aClockText[0] = 0; m_sClocks[i].m_aClockText[0] = '\0';
m_sClocks[i].m_bClockProcessed = 0; m_sClocks[i].m_bClockProcessed = false;
m_sClocks[i].m_bClockGoingDown = true; m_sClocks[i].m_bClockGoingDown = true;
} }
}
} }
void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text, uint16 pos) { void
COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text, uint16 pos)
{
if (m_sCounters[pos].m_aCounterText[0] != '\0') if (m_sCounters[pos].m_aCounterText[0] != '\0')
return; return;
m_sCounters[pos].m_nCounterOffset = offset; m_sCounters[pos].m_nCounterOffset = offset;
if(text) { if(text)
strncpy(m_sCounters[pos].m_aCounterText, text, ARRAY_SIZE(m_sCounters[0].m_aCounterText)); strncpy(m_sCounters[pos].m_aCounterText, text, ARRAY_SIZE(m_sCounters[0].m_aCounterText));
} else { else
m_sCounters[pos].m_aCounterText[0] = 0; m_sCounters[pos].m_aCounterText[0] = '\0';
}
m_sCounters[pos].m_nType = type; m_sCounters[pos].m_nType = type;
} }
void COnscreenTimer::AddClock(uint32 offset, char* text, bool bGoingDown) { void
COnscreenTimer::AddClock(uint32 offset, char* text, bool bGoingDown)
// dead code in here {
uint32 i; for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) {
for(i = 0; i < NUMONSCREENCLOCKS; i++) {
if(m_sClocks[i].m_nClockOffset == 0) { if(m_sClocks[i].m_nClockOffset == 0) {
m_sClocks[i].m_nClockOffset = offset;
m_sClocks[i].m_bClockGoingDown = bGoingDown;
if(text)
strncpy(m_sClocks[i].m_aClockText, text, ARRAY_SIZE(m_sClocks[0].m_aClockText));
else
m_sClocks[i].m_aClockText[0] = '\0';
break; break;
} }
return;
}
m_sClocks[i].m_nClockOffset = offset;
m_sClocks[i].m_bClockGoingDown = bGoingDown;
if(text) {
strncpy(m_sClocks[i].m_aClockText, text, ARRAY_SIZE(m_sClocks[0].m_aClockText));
} else {
m_sClocks[i].m_aClockText[0] = 0;
} }
} }
void COnscreenTimerEntry::Process() { void
if(m_nClockOffset == 0) { COnscreenTimerEntry::Process()
{
if(m_nClockOffset == 0)
return; return;
}
int32* timerPtr = CTheScripts::GetPointerToScriptVariable(m_nClockOffset); int32* timerPtr = CTheScripts::GetPointerToScriptVariable(m_nClockOffset);
int32 oldTime = *timerPtr; int32 oldTime = *timerPtr;
@ -147,13 +149,17 @@ void COnscreenTimerEntry::Process() {
*timerPtr = oldTime + int32(CTimer::GetTimeStepInMilliseconds()); *timerPtr = oldTime + int32(CTimer::GetTimeStepInMilliseconds());
} }
void COnscreenTimerEntry::ProcessForDisplayClock() { void
COnscreenTimerEntry::ProcessForDisplayClock()
{
uint32 time = *CTheScripts::GetPointerToScriptVariable(m_nClockOffset); uint32 time = *CTheScripts::GetPointerToScriptVariable(m_nClockOffset);
sprintf(m_aClockBuffer, "%02d:%02d", time / 1000 / 60 % 100, sprintf(m_aClockBuffer, "%02d:%02d", time / 1000 / 60 % 100,
time / 1000 % 60); time / 1000 % 60);
} }
void COnscreenCounterEntry::ProcessForDisplayCounter() { void
COnscreenCounterEntry::ProcessForDisplayCounter()
{
uint32 counter = *CTheScripts::GetPointerToScriptVariable(m_nCounterOffset); uint32 counter = *CTheScripts::GetPointerToScriptVariable(m_nCounterOffset);
sprintf(m_aCounterBuffer, "%d", counter); sprintf(m_aCounterBuffer, "%d", counter);
} }