0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCRATCH squash MinecraftLauncher into BaseLauncher

Browse Source 
needs to be split differently
needs to be squashed together with the logic from MainWindow
This commit is contained in:
Petr Mrázek
2015-06-16 09:19:55 +02:00
parent f86a39c21c
commit 5628d3d379
7 changed files with 305 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/minecraft/LegacyInstance.cpp
View File

@@ -24,7 +24,7 @@
#include "minecraft/LegacyUpdate.h"
#include "icons/IconList.h"
#include "minecraft/MinecraftLauncher.h"
#include "BaseLauncher.h"
#include "minecraft/ModList.h"
LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
@@ -122,7 +122,7 @@ BaseLauncher *LegacyInstance::prepareForLaunch(AuthSessionPtr account)
launchScript += "lwjgl " + lwjgl + "\n";
launchScript += "launcher legacy\n";
}
auto process = MinecraftLauncher::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
auto process = BaseLauncher::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
process->setLaunchScript(launchScript);
process->setWorkdir(minecraftRoot());
process->setLogin(account);