marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fail scenario saving if object saving returned nil (#1182). 

This usually means there was a script error in the scenario saving function. Better abort instead of overwriting the existing scenario with garbage data.
issue1247
Sven Eberhardt 2014-12-06 22:45:16 +01:00
parent e46c558671
commit bbe01335d9
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/game/C4Game.cpp
View File

@ -1727,20 +1727,32 @@ bool C4Game::SaveData(C4Group &hGroup, bool fSaveSection, bool fSaveExact, bool
// Save objects to file using system scripts
int32_t objects_file_handle = ::ScriptEngine.CreateUserFile();
C4AulParSet pars(C4VInt(objects_file_handle));
bool result = !!::ScriptEngine.GetPropList()->Call(PSF_SaveScenarioObjects, &pars);
C4AulUserFile *file = ::ScriptEngine.GetUserFile(objects_file_handle);
if (!result || !file || !file->GetFileLength())
C4Value result_c4v(::ScriptEngine.GetPropList()->Call(PSF_SaveScenarioObjects, &pars));
bool result = !!result_c4v;
if (result_c4v.GetType() == C4V_Nil)
{
// Nothing written? Then we don't have objects.
hGroup.Delete(C4CFN_ScenarioObjectsScript);
// That's OK; not an error.
result = true;
// Function returned nil: This usually means there was a script error during object writing.
// It could also mean the scripter overloaded global func SaveScenarioObjects and returned nil.
// In either case, objects will not match landscape any more, so better fail and don't save at all.
LogF("ERROR: No valid result from global func " PSF_SaveScenarioObjects ". Saving objects failed.");
}
else
{
// Write objects script to file!
StdStrBuf data = file->GrabFileContents();
result = hGroup.Add(C4CFN_ScenarioObjectsScript,data,false,true);
// Function completed successfully (returning true or false)
C4AulUserFile *file = ::ScriptEngine.GetUserFile(objects_file_handle);
if (!result || !file || !file->GetFileLength())
{
// Nothing written? Then we don't have objects.
hGroup.Delete(C4CFN_ScenarioObjectsScript);
// That's OK; not an error.
result = true;
}
else
{
// Write objects script to file!
StdStrBuf data = file->GrabFileContents();
result = hGroup.Add(C4CFN_ScenarioObjectsScript, data, false, true);
}
}
::ScriptEngine.CloseUserFile(objects_file_handle);
return result;