diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-09 20:49:48 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-09 20:49:48 +0100 |
| commit | 1f6a484cb2368a5704cdb4820ac06194ea6d7e1a (patch) | |
| tree | f4ebfd97c25387b3e26d4a55c5c85d67782df25d /logic/InstanceFactory.cpp | |
| parent | f8df07c3272c0e02f31f46fda8a429292c7a446a (diff) | |
| parent | 18f532b0d7d873280ec17218196db15fa64175a2 (diff) | |
| download | PrismLauncher-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.gz PrismLauncher-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.bz2 PrismLauncher-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.zip | |
Merge branch 'integration_derpstances_groupview' into develop
Diffstat (limited to 'logic/InstanceFactory.cpp')
| -rw-r--r-- | logic/InstanceFactory.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp index 1f1a5879..807bccd0 100644 --- a/logic/InstanceFactory.cpp +++ b/logic/InstanceFactory.cpp @@ -24,6 +24,7 @@ #include "OneSixInstance.h" #include "OneSixFTBInstance.h" #include "NostalgiaInstance.h" +#include "OneSixInstance.h" #include "BaseVersion.h" #include "MinecraftVersion.h" @@ -50,13 +51,13 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst QString inst_type = m_settings->get("InstanceType").toString(); // FIXME: replace with a map lookup, where instance classes register their types - if (inst_type == "Legacy") + if (inst_type == "OneSix") { - inst = new LegacyInstance(instDir, m_settings, this); + inst = new OneSixInstance(instDir, m_settings, this); } - else if (inst_type == "OneSix") + else if (inst_type == "Legacy") { - inst = new OneSixInstance(instDir, m_settings, this); + inst = new LegacyInstance(instDir, m_settings, this); } else if (inst_type == "Nostalgia") { @@ -101,6 +102,7 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance(BaseInstance *& switch (mcVer->type) { case MinecraftVersion::Legacy: + // TODO new instance type m_settings->set("InstanceType", "Legacy"); inst = new LegacyInstance(instDir, m_settings, this); inst->setIntendedVersionId(version->descriptor()); |