TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-24 09:03:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1398 from Azaezel/alpha41/stoppedClock

Browse source 
Alpha41/stopped clock
This commit is contained in:
Brian Roberts 2025-02-27 20:08:45 -06:00 • committed by GitHub
commit f56f0f811a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/fps/guiClockHud.cpp
View file

@ -179,8 +179,8 @@ void GuiClockHud::setReverseTime(F32 time)
// Set the current time in seconds.
mTimeReversed = true;
mTimeOffset = S32(time * 1000) + Platform::getVirtualMilliseconds();
mPausedTime = S32(F32(mTimeOffset + Platform::getVirtualMilliseconds()) / 1000);
mSignificantTimeReached = false;
mPausedTime = getTime();
}
void GuiClockHud::setTime(F32 time)
@ -188,8 +188,8 @@ void GuiClockHud::setTime(F32 time)
// Set the current time in seconds.
mTimeReversed = false;
mTimeOffset = S32(time * 1000) - Platform::getVirtualMilliseconds();
mPausedTime = S32(F32(mTimeOffset - Platform::getVirtualMilliseconds()) / 1000);
mSignificantTimeReached = false;
mPausedTime = getTime();
}
F32 GuiClockHud::getTime()

16
Templates/BaseGame/game/data/gameUI/GUIs/playGui.tscript
View file

@ -37,12 +37,18 @@ function PlayGui::onWake(%this)
if(isObject(moveMap))
moveMap.push();
callOnModules("Playgui_onWake");
%modulesIDList = getModulesAndGameModesList(true, "Game");
%numModsNeedingLoaded = getNumCanCallOnObjectList("Playgui_onWake", %modulesIDList);
if (%numModsNeedingLoaded)
callOnObjectList("Playgui_onWake", %modulesIdList);
}
function PlayGui::onSleep(%this)
{
callOnModules("Playgui_onSleep");
%modulesIDList = getModulesAndGameModesList(true, "Game");
%numModsNeedingLoaded = getNumCanCallOnObjectList("Playgui_onSleep", %modulesIDList);
if (%numModsNeedingLoaded)
callOnObjectList("Playgui_onSleep", %modulesIdList);
// pop the keymaps
if(isObject(moveMap))
@ -51,7 +57,11 @@ function PlayGui::onSleep(%this)
function PlayGui::clearHud( %this )
{
callOnModules("Playgui_clearHud");
%modulesIDList = getModulesAndGameModesList(true, "Game");
%numModsNeedingLoaded = getNumCanCallOnObjectList("Playgui_clearHud", %modulesIDList);
if (%numModsNeedingLoaded)
callOnObjectList("Playgui_clearHud", %modulesIdList);
Canvas.popDialog( MainChatHud );
while ( %this.getCount() > 0 )