diff options
| author | Joël Troch <joel.troch62@gmail.com> | 2020-12-09 23:16:01 +0100 |
|---|---|---|
| committer | Joël Troch <joel.troch62@gmail.com> | 2021-05-13 19:38:24 +0200 |
| commit | de089195cdb79c7f5cf46dd78782d6da5401d8da (patch) | |
| tree | 677512b9485975dbcd3967a5ac62db0eeab371d2 /api/logic/minecraft/MinecraftInstance.cpp | |
| parent | 3d11f9a7e97301483c50621db9a8b9b7b04d790f (diff) | |
| download | PrismLauncher-de089195cdb79c7f5cf46dd78782d6da5401d8da.tar.gz PrismLauncher-de089195cdb79c7f5cf46dd78782d6da5401d8da.tar.bz2 PrismLauncher-de089195cdb79c7f5cf46dd78782d6da5401d8da.zip | |
GH-3450 Add checkboxes to display and record game time
Diffstat (limited to 'api/logic/minecraft/MinecraftInstance.cpp')
| -rw-r--r-- | api/logic/minecraft/MinecraftInstance.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp index 37cdece7..2d112757 100644 --- a/api/logic/minecraft/MinecraftInstance.cpp +++ b/api/logic/minecraft/MinecraftInstance.cpp @@ -106,6 +106,11 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO m_settings->registerOverride(globalSettings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride); m_settings->registerOverride(globalSettings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride); + // Game time + auto gameTimeOverride = m_settings->registerSetting("OverrideGameTime", false); + m_settings->registerOverride(globalSettings->getSetting("ShowGameTime"), gameTimeOverride); + m_settings->registerOverride(globalSettings->getSetting("RecordGameTime"), gameTimeOverride); + // DEPRECATED: Read what versions the user configuration thinks should be used m_settings->registerSetting({"IntendedVersion", "MinecraftVersion"}, ""); m_settings->registerSetting("LWJGLVersion", ""); @@ -769,7 +774,7 @@ QString MinecraftInstance::getStatusbarDescription() QString description; description.append(tr("Minecraft %1 (%2)").arg(m_components->getComponentVersion("net.minecraft")).arg(typeName())); - if(totalTimePlayed() > 0) + if(m_settings->get("ShowGameTime").toBool() && totalTimePlayed() > 0) { description.append(tr(", played for %1").arg(prettifyTimeDuration(totalTimePlayed()))); } |