backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use standard timer types in UIController

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-10 22:22:37 +11:00
parent 7f1c1ce7f8
commit db4ea77ed9
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Minecraft.Client/Platform/Common/UI/UIController.cpp
View file

@ -50,7 +50,7 @@
CRITICAL_SECTION UIController::ms_reloadSkinCS; CRITICAL_SECTION UIController::ms_reloadSkinCS;
bool UIController::ms_bReloadSkinCSInitialised = false; bool UIController::ms_bReloadSkinCSInitialised = false;
DWORD UIController::m_dwTrialTimerLimitSecs=DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME; std::uint32_t UIController::m_dwTrialTimerLimitSecs = DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME;
static void RADLINK WarningCallback(void *user_callback_data, Iggy *player, IggyResult code, const char *message) static void RADLINK WarningCallback(void *user_callback_data, Iggy *player, IggyResult code, const char *message)
{ {
@ -898,7 +898,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
else if (down) else if (down)
{ {
// Check is enough time has elapsed to be a repeat key // Check is enough time has elapsed to be a repeat key
DWORD currentTime = GetTickCount(); std::uint32_t currentTime = GetTickCount();
if(m_actionRepeatTimer[iPad][key] > 0 && currentTime > m_actionRepeatTimer[iPad][key]) if(m_actionRepeatTimer[iPad][key] > 0 && currentTime > m_actionRepeatTimer[iPad][key])
{ {
repeat = true; repeat = true;
@ -935,7 +935,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
else if (down) else if (down)
{ {
// Check is enough time has elapsed to be a repeat key // Check is enough time has elapsed to be a repeat key
DWORD currentTime = GetTickCount(); std::uint32_t currentTime = GetTickCount();
if(m_actionRepeatTimer[iPad][key] > 0 && currentTime > m_actionRepeatTimer[iPad][key]) if(m_actionRepeatTimer[iPad][key] > 0 && currentTime > m_actionRepeatTimer[iPad][key])
{ {
repeat = true; repeat = true;
@ -2256,24 +2256,24 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
{ {
WCHAR wcTime[20]; WCHAR wcTime[20];
DWORD dwTimeTicks=(DWORD)app.getTrialTimer(); std::uint32_t timeTicks = (std::uint32_t)app.getTrialTimer();
if(dwTimeTicks>m_dwTrialTimerLimitSecs) if(timeTicks > m_dwTrialTimerLimitSecs)
{ {
dwTimeTicks=m_dwTrialTimerLimitSecs; timeTicks = m_dwTrialTimerLimitSecs;
} }
dwTimeTicks=m_dwTrialTimerLimitSecs-dwTimeTicks; timeTicks = m_dwTrialTimerLimitSecs - timeTicks;
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
if(true) if(true)
#else #else
// display the time - only if there's less than 3 minutes // display the time - only if there's less than 3 minutes
if(dwTimeTicks<180) if(timeTicks < 180)
#endif #endif
{ {
int iMins=dwTimeTicks/60; int iMins = timeTicks / 60;
int iSeconds=dwTimeTicks%60; int iSeconds = timeTicks % 60;
swprintf( wcTime, 20, L"%d:%02d",iMins,iSeconds); swprintf( wcTime, 20, L"%d:%02d",iMins,iSeconds);
if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(wcTime); if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(wcTime);
} }
@ -2283,7 +2283,7 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
} }
// are we out of time? // are we out of time?
if((dwTimeTicks==0)) if(timeTicks == 0)
{ {
// Trial over // Trial over
// bring up the pause menu to stop the trial over message box being called again? // bring up the pause menu to stop the trial over message box being called again?
@ -2298,14 +2298,14 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
void UIController::ReduceTrialTimerValue() void UIController::ReduceTrialTimerValue()
{ {
DWORD dwTimeTicks=(int)app.getTrialTimer(); std::uint32_t timeTicks = (std::uint32_t)app.getTrialTimer();
if(dwTimeTicks>m_dwTrialTimerLimitSecs) if(timeTicks > m_dwTrialTimerLimitSecs)
{ {
dwTimeTicks=m_dwTrialTimerLimitSecs; timeTicks = m_dwTrialTimerLimitSecs;
} }
m_dwTrialTimerLimitSecs-=dwTimeTicks; m_dwTrialTimerLimitSecs -= timeTicks;
} }
void UIController::ShowAutosaveCountdownTimer(bool show) void UIController::ShowAutosaveCountdownTimer(bool show)

4
Minecraft.Client/Platform/Common/UI/UIController.h
View file

@ -32,7 +32,7 @@ private:
static const int UI_REPEAT_KEY_DELAY_MS = 300; // How long from press until the first repeat static const int UI_REPEAT_KEY_DELAY_MS = 300; // How long from press until the first repeat
static const int UI_REPEAT_KEY_REPEAT_RATE_MS = 100; // How long in between repeats static const int UI_REPEAT_KEY_REPEAT_RATE_MS = 100; // How long in between repeats
DWORD m_actionRepeatTimer[XUSER_MAX_COUNT][ACTION_MAX_MENU+1]; std::uint32_t m_actionRepeatTimer[XUSER_MAX_COUNT][ACTION_MAX_MENU+1];
float m_fScreenWidth; float m_fScreenWidth;
float m_fScreenHeight; float m_fScreenHeight;
@ -113,7 +113,7 @@ private:
C4JRender::eViewportType m_currentRenderViewport; C4JRender::eViewportType m_currentRenderViewport;
bool m_bCustomRenderPosition; bool m_bCustomRenderPosition;
static DWORD m_dwTrialTimerLimitSecs; static std::uint32_t m_dwTrialTimerLimitSecs;
std::unordered_map<std::wstring, byteArray> m_substitutionTextures; std::unordered_map<std::wstring, byteArray> m_substitutionTextures;