CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCRATCH eliminate InstanceFactory

Browse Source
This commit is contained in:
Petr Mrázek
2015-02-01 03:08:25 +01:00
parent c088d3bef0
commit 154d19bb74
23 changed files with 205 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/minecraft/MinecraftInstance.cpp
View File

@ -4,11 +4,9 @@
#include <pathutils.h>
#include "logic/minecraft/MinecraftVersionList.h"
MinecraftInstance::MinecraftInstance(const QString &rootDir, SettingsObject *settings, QObject *parent)
: BaseInstance(rootDir, settings, parent)
MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
: BaseInstance(globalSettings, settings, rootDir)
{
auto globalSettings = MMC->settings();
// Java Settings
m_settings->registerSetting("OverrideJava", false);
m_settings->registerSetting("OverrideJavaLocation", false);

2
logic/minecraft/MinecraftInstance.h
View File

@ -4,7 +4,7 @@
class MinecraftInstance: public BaseInstance
{
public:
MinecraftInstance(const QString& rootDir, SettingsObject* settings, QObject* parent = 0);
MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
virtual ~MinecraftInstance() {};
/// Path to the instance's minecraft directory.