summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/script/script_fatalerror.hpp6
-rw-r--r--src/script/script_instance.cpp8
-rw-r--r--src/script/script_scanner.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/script/script_fatalerror.hpp b/src/script/script_fatalerror.hpp
index 5d1a2c125..96c64e0b9 100644
--- a/src/script/script_fatalerror.hpp
+++ b/src/script/script_fatalerror.hpp
@@ -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 */
diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp
index 8227060d3..f7f9de4fc 100644
--- a/src/script/script_instance.cpp
+++ b/src/script/script_instance.cpp
@@ -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
diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp
index 6fa88bfee..8b48809bf 100644
--- a/src/script/script_scanner.cpp
+++ b/src/script/script_scanner.cpp
@@ -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;