External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-22 11:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCRATCH remove remaining references to MultiMC.h and fix legacy LWJGL

Browse Source
This commit is contained in:
Petr Mrázek
2015-02-02 01:09:28 +01:00
parent 382ae78a0b
commit d313e9ab09
28 changed files with 209 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
logic/LegacyInstance.cpp
View File

@@ -20,8 +20,6 @@
#include <pathutils.h>
#include <cmdutils.h>
#include "MultiMC.h"
#include "LegacyInstance.h"
#include "logic/LegacyUpdate.h"
@@ -38,6 +36,7 @@
LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
: MinecraftInstance(globalSettings, settings, rootDir)
{
m_lwjglFolderSetting = globalSettings->getSetting("LWJGLDir");
settings->registerSetting("NeedsRebuild", true);
settings->registerSetting("ShouldUpdate", false);
settings->registerSetting("JarVersion", "Unknown");
@@ -142,7 +141,7 @@ BaseProcess *LegacyInstance::prepareForLaunch(AuthSessionPtr account)
.arg(settings().get("MinecraftWinWidth").toInt())
.arg(settings().get("MinecraftWinHeight").toInt());
QString lwjgl = QDir(MMC->settings()->get("LWJGLDir").toString() + "/" + lwjglVersion())
QString lwjgl = QDir(m_lwjglFolderSetting->get().toString() + "/" + lwjglVersion())
.absolutePath();
launchScript += "userName " + account->player_name + "\n";
launchScript += "sessionId " + account->session + "\n";
@@ -340,3 +339,8 @@ QString LegacyInstance::getStatusbarDescription()
}
return tr("Legacy : %1").arg(intendedVersionId());
}
QString LegacyInstance::lwjglFolder() const
{
return m_lwjglFolderSetting->get().toString();
}