diff options
| author | Eugene Sandulenko | 2010-08-16 20:23:53 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:50:28 +0000 |
| commit | a1d22a063b2a9de47cf3f23cac1cd73777eea321 (patch) | |
| tree | 4a4c3c12e76a91deb15d475cddd3e1a8ce5c919e /engines/sword25/script | |
| parent | b65284078aaa3c1fc3dcc7bebf804d2dc43a8e41 (diff) | |
| download | scummvm-rg350-a1d22a063b2a9de47cf3f23cac1cd73777eea321.tar.gz scummvm-rg350-a1d22a063b2a9de47cf3f23cac1cd73777eea321.tar.bz2 scummvm-rg350-a1d22a063b2a9de47cf3f23cac1cd73777eea321.zip | |
SWORD25: Fix warnings
svn-id: r53254
Diffstat (limited to 'engines/sword25/script')
| -rw-r--r-- | engines/sword25/script/luascript.cpp | 8 | ||||
| -rw-r--r-- | engines/sword25/script/luascript.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp index 38363df94b..6d2816ae13 100644 --- a/engines/sword25/script/luascript.cpp +++ b/engines/sword25/script/luascript.cpp @@ -158,7 +158,7 @@ bool BS_LuaScriptEngine::ExecuteFile(const Common::String &FileName) { // File read unsigned int FileSize; - char *FileData = static_cast<char *>(pPackage->GetFile(FileName, &FileSize)); + byte *FileData = pPackage->GetFile(FileName, &FileSize); if (!FileData) { BS_LOG_ERRORLN("Couldn't read \"%s\".", FileName.c_str()); #ifdef DEBUG @@ -190,7 +190,7 @@ bool BS_LuaScriptEngine::ExecuteFile(const Common::String &FileName) { // ----------------------------------------------------------------------------- bool BS_LuaScriptEngine::ExecuteString(const Common::String &Code) { - return ExecuteBuffer(Code.c_str(), Code.size(), "???"); + return ExecuteBuffer((byte *)Code.c_str(), Code.size(), "???"); } // ----------------------------------------------------------------------------- @@ -220,9 +220,9 @@ bool BS_LuaScriptEngine::RegisterStandardLibs() { // ----------------------------------------------------------------------------- -bool BS_LuaScriptEngine::ExecuteBuffer(const char *Data, unsigned int Size, const Common::String &Name) const { +bool BS_LuaScriptEngine::ExecuteBuffer(const byte *Data, unsigned int Size, const Common::String &Name) const { // Compile buffer - if (luaL_loadbuffer(m_State, Data, Size, Name.c_str()) != 0) { + if (luaL_loadbuffer(m_State, (const char *)Data, Size, Name.c_str()) != 0) { BS_LOG_ERRORLN("Couldn't compile \"%s\":\n%s", Name.c_str(), lua_tostring(m_State, -1)); lua_pop(m_State, 1); diff --git a/engines/sword25/script/luascript.h b/engines/sword25/script/luascript.h index 228625a67b..39fa9ebec4 100644 --- a/engines/sword25/script/luascript.h +++ b/engines/sword25/script/luascript.h @@ -124,7 +124,7 @@ private: bool RegisterStandardLibs(); bool RegisterStandardLibExtensions(); - bool ExecuteBuffer(const char *Data, unsigned int Size, const Common::String &Name) const; + bool ExecuteBuffer(const byte *Data, unsigned int Size, const Common::String &Name) const; }; } // End of namespace Sword25 |