summaryrefslogtreecommitdiffstats
path: root/logic/InstanceFactory.cpp
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-01-24 18:17:26 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-01-24 18:17:26 +0100
commit0f7b38c76bacc210beae21c4e23cc312f53fa5e4 (patch)
tree1c56d8abf2b4760d97d8485b30ef6613cc77908b /logic/InstanceFactory.cpp
parent7d5787025aa5cebf6778f71e79f248f10b8541c9 (diff)
downloadMultiMC-0f7b38c76bacc210beae21c4e23cc312f53fa5e4.tar
MultiMC-0f7b38c76bacc210beae21c4e23cc312f53fa5e4.tar.gz
MultiMC-0f7b38c76bacc210beae21c4e23cc312f53fa5e4.tar.lz
MultiMC-0f7b38c76bacc210beae21c4e23cc312f53fa5e4.tar.xz
MultiMC-0f7b38c76bacc210beae21c4e23cc312f53fa5e4.zip
Fix some stuff
Diffstat (limited to 'logic/InstanceFactory.cpp')
-rw-r--r--logic/InstanceFactory.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp
index 730bcd69..807bccd0 100644
--- a/logic/InstanceFactory.cpp
+++ b/logic/InstanceFactory.cpp
@@ -51,7 +51,7 @@ 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 == "OneSix" || inst_type == "OneSix")
+ if (inst_type == "OneSix")
{
inst = new OneSixInstance(instDir, m_settings, this);
}
@@ -67,7 +67,7 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst
{
inst = new LegacyFTBInstance(instDir, m_settings, this);
}
- else if (inst_type == "OneSixFTB" || inst_type == "OneSixFTB")
+ else if (inst_type == "OneSixFTB")
{
inst = new OneSixFTBInstance(instDir, m_settings, this);
}
@@ -102,7 +102,7 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance(BaseInstance *&
switch (mcVer->type)
{
case MinecraftVersion::Legacy:
- // TODO OneSix
+ // TODO new instance type
m_settings->set("InstanceType", "Legacy");
inst = new LegacyInstance(instDir, m_settings, this);
inst->setIntendedVersionId(version->descriptor());
@@ -176,7 +176,7 @@ InstanceFactory::InstCreateError InstanceFactory::copyInstance(BaseInstance *&ne
m_settings->registerSetting("InstanceType", "Legacy");
QString inst_type = m_settings->get("InstanceType").toString();
- if(inst_type == "OneSixFTB" || inst_type == "OneSixFTB")
+ if(inst_type == "OneSixFTB")
m_settings->set("InstanceType", "OneSix");
if(inst_type == "LegacyFTB")
m_settings->set("InstanceType", "Legacy");