diff options
Diffstat (limited to 'engines/sword25')
| -rw-r--r-- | engines/sword25/fmv/movieplayer.h | 2 | ||||
| -rw-r--r-- | engines/sword25/script/luacallback.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/script/luascript.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/sword25.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/util/lua/lbaselib.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/util/lua/ldo.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword25/fmv/movieplayer.h b/engines/sword25/fmv/movieplayer.h index 95fb05ee60..b59b223b4c 100644 --- a/engines/sword25/fmv/movieplayer.h +++ b/engines/sword25/fmv/movieplayer.h @@ -67,7 +67,7 @@ public: * movie file, it will be unloaded and, if necessary, stopped playing. * @param Filename The filename of the movie file to be loaded * @param Z Z indicates the position of the film on the main graphics layer - * @return Returns false if an error occured while loading, otherwise true. + * @return Returns false if an error occurred while loading, otherwise true. */ bool loadMovie(const Common::String &filename, uint z); diff --git a/engines/sword25/script/luacallback.cpp b/engines/sword25/script/luacallback.cpp index 72f7e01612..acfda498c6 100644 --- a/engines/sword25/script/luacallback.cpp +++ b/engines/sword25/script/luacallback.cpp @@ -119,7 +119,7 @@ void LuaCallback::invokeCallbackFunctions(lua_State *L, uint objectHandle) { // Lua_pcall the function and the parameters pop themselves from the stack if (lua_pcall(L, argumentCount, 0, 0) != 0) { // An error has occurred - error("An error occured executing a callback function: %s", lua_tostring(L, -1)); + error("An error occurred executing a callback function: %s", lua_tostring(L, -1)); // Pop error message from the stack lua_pop(L, 1); diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp index e93289596b..3aca6676ac 100644 --- a/engines/sword25/script/luascript.cpp +++ b/engines/sword25/script/luascript.cpp @@ -214,7 +214,7 @@ bool LuaScriptEngine::executeBuffer(const byte *data, uint size, const Common::S // Run buffer contents if (lua_pcall(_state, 0, 0, -2) != 0) { - error("An error occured while executing \"%s\":\n%s.", + error("An error occurred while executing \"%s\":\n%s.", name.c_str(), lua_tostring(_state, -1)); lua_pop(_state, 2); diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp index 5223481d50..b6f2641714 100644 --- a/engines/sword25/sword25.cpp +++ b/engines/sword25/sword25.cpp @@ -120,7 +120,7 @@ Common::Error Sword25Engine::appStart() { // Pass the command line to the script engine. ScriptEngine *scriptPtr = Kernel::getInstance()->getScript(); if (!scriptPtr) { - error("Script intialization failed."); + error("Script initialization failed."); return Common::kUnknownError; } diff --git a/engines/sword25/util/lua/lbaselib.cpp b/engines/sword25/util/lua/lbaselib.cpp index 659c61d956..ec044970ad 100644 --- a/engines/sword25/util/lua/lbaselib.cpp +++ b/engines/sword25/util/lua/lbaselib.cpp @@ -492,7 +492,7 @@ static int costatus (lua_State *L, lua_State *co) { else return CO_SUS; /* initial state */ } - default: /* some error occured */ + default: /* some error occurred */ return CO_DEAD; } } diff --git a/engines/sword25/util/lua/ldo.cpp b/engines/sword25/util/lua/ldo.cpp index a230097f2a..d53f95adaa 100644 --- a/engines/sword25/util/lua/ldo.cpp +++ b/engines/sword25/util/lua/ldo.cpp @@ -114,7 +114,7 @@ void luaD_throw (lua_State *L, int errcode) { // LUAI_THROW has been replaced with an error message in ScummVM, together // with the LUA error code and description //LUAI_THROW(L, L->errorJmp); - error("LUA error occured, error code is %d (%s)", errcode, luaErrorDescription[errcode]); + error("LUA error occurred, error code is %d (%s)", errcode, luaErrorDescription[errcode]); } else { L->status = cast_byte(errcode); |