immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for #516

master
Piotr Dziwinski 2015-07-19 16:43:03 +02:00
parent 264f5dc278
commit 963fa15a1c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/object/robotmain.cpp
View File

@ -5110,6 +5110,8 @@ CObject* CRobotMain::IOReadScene(const char *filename, const char *filecbot)
m_base = nullptr; m_base = nullptr;
CObject* cargo = nullptr;
CObject* power = nullptr;
CObject* sel = nullptr; CObject* sel = nullptr;
int objRank = 0; int objRank = 0;
for (auto& line : levelParser.GetLines()) for (auto& line : levelParser.GetLines())
@ -5129,11 +5131,9 @@ CObject* CRobotMain::IOReadScene(const char *filename, const char *filecbot)
m_lightning->SetStatus(sleep, delay, magnetic, progress); m_lightning->SetStatus(sleep, delay, magnetic, progress);
} }
CObject* cargo = nullptr;
if (line->GetCommand() == "CreateFret") if (line->GetCommand() == "CreateFret")
cargo = IOReadObject(line.get(), filename, -1); cargo = IOReadObject(line.get(), filename, -1);
CObject* power = nullptr;
if (line->GetCommand() == "CreatePower") if (line->GetCommand() == "CreatePower")
power = IOReadObject(line.get(), filename, -1); power = IOReadObject(line.get(), filename, -1);
@ -5161,6 +5161,8 @@ CObject* CRobotMain::IOReadScene(const char *filename, const char *filecbot)
assert(power->Implements(ObjectInterfaceType::Transportable)); assert(power->Implements(ObjectInterfaceType::Transportable));
dynamic_cast<CTransportableObject*>(power)->SetTransporter(obj); dynamic_cast<CTransportableObject*>(power)->SetTransporter(obj);
} }
cargo = nullptr;
power = nullptr;
} }
} }