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

Changed default of countTransported to true 

This causes failure conditions to trigger in some exercises
 #412
master
krzys-h 2015-03-29 15:38:48 +02:00
parent 30f7075f4e
commit 1b18b145cc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/object/robotmain.cpp
View File

@ -1933,8 +1933,11 @@ void CRobotMain::DeleteAllObjects()
{ {
CObject* obj = it.second; CObject* obj = it.second;
obj->DeleteObject(true); // destroys rapidly if(obj != nullptr)
delete obj; {
obj->DeleteObject(true); // destroys rapidly
delete obj;
}
} }
} }
@ -3844,7 +3847,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
m_endTake[i].drive = line->GetParam("drive")->AsDriveType(DRIVE_OTHER); m_endTake[i].drive = line->GetParam("drive")->AsDriveType(DRIVE_OTHER);
m_endTake[i].lost = line->GetParam("lost")->AsInt(-1); m_endTake[i].lost = line->GetParam("lost")->AsInt(-1);
m_endTake[i].immediat = line->GetParam("immediat")->AsBool(false); m_endTake[i].immediat = line->GetParam("immediat")->AsBool(false);
m_endTake[i].countTransported = line->GetParam("countTransported")->AsBool(false); m_endTake[i].countTransported = line->GetParam("countTransported")->AsBool(true);
strcpy(m_endTake[i].message, line->GetParam("message")->AsString("").c_str()); //TODO: Really, ending mission on message()? Is this used anywhere? Do we need that? strcpy(m_endTake[i].message, line->GetParam("message")->AsString("").c_str()); //TODO: Really, ending mission on message()? Is this used anywhere? Do we need that?
m_endTakeTotal ++; m_endTakeTotal ++;
} }