diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-01 19:37:16 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-01 19:37:16 +0100 |
| commit | 1936bd181f57a554ce0dd757ffe9419100eb47f4 (patch) | |
| tree | a22660979335746b930c88f353b4e29f1bbe9a2a /logic/InstanceFactory.cpp | |
| parent | b4b6091372310f4a811180cffde3ea5611881e6c (diff) | |
| parent | 8637cce4333aaf56a231d5fab866b0e770436783 (diff) | |
| download | MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.gz MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.lz MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.xz MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.zip | |
Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances
Conflicts:
gui/dialogs/OneSixModEditDialog.cpp
logic/OneSixUpdate.cpp
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()); |