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

Fixed starting programs from saved games (#455)

master
krzys-h 2015-04-07 13:18:34 +02:00
parent ed0850ddb6
commit a4bf622053
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/object/robotmain.cpp
View File

@ -4641,7 +4641,7 @@ void CRobotMain::LoadOneScript(CObject *obj, int &nbError)
char* name = m_dialog->GetSceneName(); char* name = m_dialog->GetSceneName();
int rank = m_dialog->GetSceneRank(); int rank = m_dialog->GetSceneRank();
for(unsigned int i = 0; i < 999; i++) for(unsigned int i = 0; i <= 999; i++)
{ {
//? if (brain->GetCompile(i)) continue; //? if (brain->GetCompile(i)) continue;
@ -4674,7 +4674,7 @@ void CRobotMain::LoadFileScript(CObject *obj, const char* filename, int objRank,
dirname = dirname.substr(0, dirname.find_last_of("/")); dirname = dirname.substr(0, dirname.find_last_of("/"));
char fn[MAX_FNAME]; //TODO: Refactor to std::string char fn[MAX_FNAME]; //TODO: Refactor to std::string
for(unsigned int i = 0; i < 999; i++) for(unsigned int i = 0; i <= 999; i++)
{ {
sprintf(fn, "%s/prog%.3d%.3d.txt", dirname.c_str(), objRank, i); sprintf(fn, "%s/prog%.3d%.3d.txt", dirname.c_str(), objRank, i);
if(CResourceManager::Exists(fn)) if(CResourceManager::Exists(fn))
@ -4717,7 +4717,7 @@ void CRobotMain::SaveOneScript(CObject *obj)
auto programs = brain->GetPrograms(); auto programs = brain->GetPrograms();
// TODO: Find a better way to do that // TODO: Find a better way to do that
for(unsigned int i = 0; i < 999; i++) for(unsigned int i = 0; i <= 999; i++)
{ {
char filename[MAX_FNAME]; char filename[MAX_FNAME];
sprintf(filename, "%s/%s/%c%.3d%.3d%.3d.txt", sprintf(filename, "%s/%s/%c%.3d%.3d%.3d.txt",
@ -4751,7 +4751,7 @@ void CRobotMain::SaveFileScript(CObject *obj, const char* filename, int objRank)
char fn[MAX_FNAME]; //TODO: Refactor to std::string char fn[MAX_FNAME]; //TODO: Refactor to std::string
auto programs = brain->GetPrograms(); auto programs = brain->GetPrograms();
// TODO: Find a better way to do that // TODO: Find a better way to do that
for(unsigned int i = 0; i < 999; i++) for(unsigned int i = 0; i <= 999; i++)
{ {
sprintf(fn, "%s/prog%.3d%.3d.txt", dirname.c_str(), objRank, i); sprintf(fn, "%s/prog%.3d%.3d.txt", dirname.c_str(), objRank, i);
if(i < programs.size()) if(i < programs.size())
@ -5092,6 +5092,13 @@ CObject* CRobotMain::IOReadObject(CLevelParserLine *line, const char* filename,
CAuto* automat = obj->GetAuto(); CAuto* automat = obj->GetAuto();
if (automat != nullptr) if (automat != nullptr)
automat->Start(run); // starts the film automat->Start(run); // starts the film
CBrain* brain = obj->GetBrain();
if (brain != nullptr)
{
Program* program = brain->GetOrAddProgram(run-1);
brain->SetScriptRun(program); // marks the program to be started
}
} }
return obj; return obj;
@ -5180,6 +5187,23 @@ CObject* CRobotMain::IOReadScene(const char *filename, const char *filecbot)
} }
while (nbError > 0 && nbError != lastError); while (nbError > 0 && nbError != lastError);
// Starts scripts
for(auto it : objman->GetAllObjects())
{
CObject* obj = it.second;
if (obj->GetTruck() != nullptr) continue;
if (obj->GetDefRank() == -1) continue;
CBrain* brain = obj->GetBrain();
if (brain == nullptr) continue;
Program* program = brain->GetScriptRun();
if (program != nullptr)
{
brain->RunProgram(program); // starts the program
}
}
// Reads the file of stacks of execution. // Reads the file of stacks of execution.
FILE* file = fOpen(filecbot, "rb"); FILE* file = fOpen(filecbot, "rb");
if (file != NULL) if (file != NULL)