LegacyConsole/GabsPuNs-MinecraftConsoles
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git synced 2026-05-27 06:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update GetTickCount to GetTickCount64

Browse Source
This commit is contained in:
GabsPuNs
2026-04-11 10:06:31 -04:00
parent 720efd2f2e
commit 6be56e5786
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Minecraft.Client/Common/Tutorial/Tutorial.cpp
View File

@@ -1299,7 +1299,7 @@ void Tutorial::tick()
// Don't do anything for the first 2 seconds so that the loading screen is gone
if(!m_bHasTickedOnce)
{
int time = GetTickCount();
int time = GetTickCount64();
if(m_firstTickTime == 0)
{
m_firstTickTime = time;
@@ -1363,7 +1363,7 @@ void Tutorial::tick()
if(!m_allowShow)
{
if( currentTask[m_CurrentState] != nullptr && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
if( currentTask[m_CurrentState] != nullptr && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount64() ) )
{
uiTempDisabled = true;
}
@@ -1413,7 +1413,7 @@ void Tutorial::tick()
if(ui.IsPauseMenuDisplayed( m_iPad ) )
{
if( currentTask[m_CurrentState] != nullptr && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
if( currentTask[m_CurrentState] != nullptr && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount64() ) )
{
uiTempDisabled = true;
}
@@ -1423,7 +1423,7 @@ void Tutorial::tick()
if( uiTempDisabled )
{
ui.SetTutorialVisible( m_iPad, true );
lastMessageTime = GetTickCount();
lastMessageTime = GetTickCount64();
uiTempDisabled = false;
}
@@ -1490,7 +1490,7 @@ void Tutorial::tick()
{
isCurrentTask = false;
if(
( !task->ShowMinimumTime() || ( task->hasBeenActivated() && (lastMessageTime + m_iTutorialMinimumDisplayMessageTime ) < GetTickCount() ) )
( !task->ShowMinimumTime() || ( task->hasBeenActivated() && (lastMessageTime + m_iTutorialMinimumDisplayMessageTime ) < GetTickCount64() ) )
&& task->isCompleted()
)
{
@@ -1567,7 +1567,7 @@ void Tutorial::tick()
{
++it;
}
if( task != nullptr && task->ShowMinimumTime() && task->hasBeenActivated() && (lastMessageTime + m_iTutorialMinimumDisplayMessageTime ) < GetTickCount() )
if( task != nullptr && task->ShowMinimumTime() && task->hasBeenActivated() && (lastMessageTime + m_iTutorialMinimumDisplayMessageTime ) < GetTickCount64() )
{
task->setShownForMinimumTime();
@@ -1642,12 +1642,12 @@ void Tutorial::tick()
}
}
if(m_hintDisplayed && (lastMessageTime + m_iTutorialDisplayMessageTime ) < GetTickCount() )
if(m_hintDisplayed && (lastMessageTime + m_iTutorialDisplayMessageTime ) < GetTickCount64() )
{
m_hintDisplayed = false;
}
if( currentFailedConstraint[m_CurrentState] == nullptr && currentTask[m_CurrentState] != nullptr && (m_iTaskReminders!=0) && (lastMessageTime + (m_iTaskReminders * m_iTutorialReminderTime) ) < GetTickCount() )
if( currentFailedConstraint[m_CurrentState] == nullptr && currentTask[m_CurrentState] != nullptr && (m_iTaskReminders!=0) && (lastMessageTime + (m_iTaskReminders * m_iTutorialReminderTime) ) < GetTickCount64() )
{
// Reminder
PopupMessageDetails *message = new PopupMessageDetails();
@@ -1675,7 +1675,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
if(message != nullptr && !message->m_forceDisplay &&
m_lastMessageState == m_CurrentState &&
message->isSameContent(m_lastMessage) &&
( !message->m_isReminder || ( (lastMessageTime + m_iTutorialReminderTime ) > GetTickCount() && message->m_isReminder ) )
( !message->m_isReminder || ( (lastMessageTime + m_iTutorialReminderTime ) > GetTickCount64() && message->m_isReminder ) )
)
{
delete message;
@@ -1686,7 +1686,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
{
m_lastMessageState = m_CurrentState;
if(!message->m_replaceCurrent) lastMessageTime = GetTickCount();
if(!message->m_replaceCurrent) lastMessageTime = GetTickCount64();
wstring text;
if(!message->m_messageString.empty())
@@ -1755,7 +1755,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
ui.SetTutorialDescription( m_iPad, &popupInfo );
}
}
else if( (m_lastMessage != nullptr && m_lastMessage->m_messageId != -1) ) //&& (lastMessageTime + m_iTutorialReminderTime ) > GetTickCount() )
else if( (m_lastMessage != nullptr && m_lastMessage->m_messageId != -1) ) //&& (lastMessageTime + m_iTutorialReminderTime ) > GetTickCount64() )
{
// This should cause the popup to dissappear
TutorialPopupInfo popupInfo;
@@ -1777,7 +1777,7 @@ bool Tutorial::setMessage(TutorialHint *hint, PopupMessageDetails *message)
bool hintsOn = m_isFullTutorial || (app.GetGameSettings(m_iPad,eGameSetting_Hints) && app.GetGameSettings(m_iPad,eGameSetting_DisplayHUD));
bool messageShown = false;
DWORD time = GetTickCount();
DWORD time = GetTickCount64();
if(message != nullptr && (message->m_forceDisplay || hintsOn) &&
(!message->m_delay ||
(
@@ -1816,7 +1816,7 @@ void Tutorial::showTutorialPopup(bool show)
if(!show)
{
if( currentTask[m_CurrentState] != nullptr && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
if( currentTask[m_CurrentState] != nullptr && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount64() ) )
{
uiTempDisabled = true;
}