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

Fix some stuff

Browse Source
This commit is contained in:
Jan Dalheimer 2014-01-24 18:17:26 +01:00
parent 7d5787025a
commit 0f7b38c76b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
logic/InstanceFactory.cpp
View File

@ -51,7 +51,7 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst
QString inst_type = m_settings->get("InstanceType").toString(); QString inst_type = m_settings->get("InstanceType").toString();
// FIXME: replace with a map lookup, where instance classes register their types // 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); inst = new OneSixInstance(instDir, m_settings, this);
} }
@ -67,7 +67,7 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst
{ {
inst = new LegacyFTBInstance(instDir, m_settings, this); 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); inst = new OneSixFTBInstance(instDir, m_settings, this);
} }
@ -102,7 +102,7 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance(BaseInstance *&
switch (mcVer->type) switch (mcVer->type)
{ {
case MinecraftVersion::Legacy: case MinecraftVersion::Legacy:
// TODO OneSix // TODO new instance type
m_settings->set("InstanceType", "Legacy"); m_settings->set("InstanceType", "Legacy");
inst = new LegacyInstance(instDir, m_settings, this); inst = new LegacyInstance(instDir, m_settings, this);
inst->setIntendedVersionId(version->descriptor()); inst->setIntendedVersionId(version->descriptor());
@ -176,7 +176,7 @@ InstanceFactory::InstCreateError InstanceFactory::copyInstance(BaseInstance *&ne
m_settings->registerSetting("InstanceType", "Legacy"); m_settings->registerSetting("InstanceType", "Legacy");
QString inst_type = m_settings->get("InstanceType").toString(); QString inst_type = m_settings->get("InstanceType").toString();
if(inst_type == "OneSixFTB" || inst_type == "OneSixFTB") if(inst_type == "OneSixFTB")
m_settings->set("InstanceType", "OneSix"); m_settings->set("InstanceType", "OneSix");
if(inst_type == "LegacyFTB") if(inst_type == "LegacyFTB")
m_settings->set("InstanceType", "Legacy"); m_settings->set("InstanceType", "Legacy");