mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change: [Script] Let Script_FatalError use std::string instead of const char *

This commit is contained in:
Rubidium 2021-04-17 09:59:18 +02:00 committed by Michael Lutz
parent 3248a6c12b
commit 4400bbfa96
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/script_fatalerror.hpp
View File

@ -19,7 +19,7 @@ public:
* Creates a "fatal error" exception.
* @param msg The message describing the cause of the fatal error.
*/
Script_FatalError(const char *msg) :
Script_FatalError(const std::string &msg) :
msg(msg)
{}
@ -27,10 +27,10 @@ public:
* The error message associated with the fatal error.
* @return The error message.
*/
const char *GetErrorMessage() { return msg; }
const std::string &GetErrorMessage() const { return msg; }
private:
const char *msg; ///< The error message.
const std::string msg; ///< The error message.
};
#endif /* SCRIPT_FATALERROR_HPP */

8
src/script/script_instance.cpp
View File

@ -100,7 +100,7 @@ void ScriptInstance::Initialize(const char *main_script, const char *instance_na
ScriptObject::SetAllowDoCommand(true);
} catch (Script_FatalError &e) {
this->is_dead = true;
this->engine->ThrowError(e.GetErrorMessage());
this->engine->ThrowError(e.GetErrorMessage().c_str());
this->engine->ResumeError();
this->Died();
}
@ -228,7 +228,7 @@ void ScriptInstance::GameLoop()
this->callback = e.GetSuspendCallback();
} catch (Script_FatalError &e) {
this->is_dead = true;
this->engine->ThrowError(e.GetErrorMessage());
this->engine->ThrowError(e.GetErrorMessage().c_str());
this->engine->ResumeError();
this->Died();
}
@ -249,7 +249,7 @@ void ScriptInstance::GameLoop()
this->callback = e.GetSuspendCallback();
} catch (Script_FatalError &e) {
this->is_dead = true;
this->engine->ThrowError(e.GetErrorMessage());
this->engine->ThrowError(e.GetErrorMessage().c_str());
this->engine->ResumeError();
this->Died();
}
@ -505,7 +505,7 @@ void ScriptInstance::Save()
/* If we don't mark the script as dead here cleaning up the squirrel
* stack could throw Script_FatalError again. */
this->is_dead = true;
this->engine->ThrowError(e.GetErrorMessage());
this->engine->ThrowError(e.GetErrorMessage().c_str());
this->engine->ResumeError();
SaveEmpty();
/* We can't kill the script here, so mark it as crashed (not dead) and

2
src/script/script_scanner.cpp
View File

@ -38,7 +38,7 @@ bool ScriptScanner::AddFile(const std::string &filename, size_t basepath_length,
try {
this->engine->LoadScript(filename.c_str());
} catch (Script_FatalError &e) {
DEBUG(script, 0, "Fatal error '%s' when trying to load the script '%s'.", e.GetErrorMessage(), filename.c_str());
DEBUG(script, 0, "Fatal error '%s' when trying to load the script '%s'.", e.GetErrorMessage().c_str(), filename.c_str());
return false;
}
return true;