diff options
| author | Paul Gilbert | 2010-08-03 09:47:45 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:21:24 +0000 |
| commit | 86bef1508c3fb3c21a10e3f35305f6eaf641a33e (patch) | |
| tree | c2a47a3cca578ba5b9b6a156ddbc576221f14beb /engines/sword25/script | |
| parent | fab86ba22250c282139fb0c94a250499abdc875f (diff) | |
| download | scummvm-rg350-86bef1508c3fb3c21a10e3f35305f6eaf641a33e.tar.gz scummvm-rg350-86bef1508c3fb3c21a10e3f35305f6eaf641a33e.tar.bz2 scummvm-rg350-86bef1508c3fb3c21a10e3f35305f6eaf641a33e.zip | |
SWORD25: Converted the input engine to use the ScummVM event manager
svn-id: r53203
Diffstat (limited to 'engines/sword25/script')
| -rw-r--r-- | engines/sword25/script/luascript.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp index 129dd03c8a..62b5791a82 100644 --- a/engines/sword25/script/luascript.cpp +++ b/engines/sword25/script/luascript.cpp @@ -38,6 +38,7 @@ // Includes // ----------------------------------------------------------------------------- +#include "common/array.h" #include "sword25/package/packagemanager.h" #include "sword25/script/luascript.h" #include "sword25/script/luabindhelper.h" @@ -58,7 +59,6 @@ extern "C" { namespace Sword25 { -using namespace std; using namespace Lua; // ----------------------------------------------------------------------------- @@ -410,7 +410,7 @@ namespace { namespace { int Chunkwriter(lua_State *L, const void *p, size_t sz, void *ud) { - vector<unsigned char> & chunkData = *reinterpret_cast<vector<unsigned char> * >(ud); + Common::Array<unsigned char> & chunkData = *reinterpret_cast<Common::Array<unsigned char> * >(ud); const unsigned char *buffer = reinterpret_cast<const unsigned char *>(p); while (sz--) chunkData.push_back(*buffer++) ; @@ -431,8 +431,8 @@ bool BS_LuaScriptEngine::Persist(BS_OutputPersistenceBlock &Writer) { PushPermanentsTable(m_State, PTT_PERSIST); lua_getglobal(m_State, "_G"); - // Lua persists and stores the data in a vector - vector<unsigned char> chunkData; + // Lua persists and stores the data in a Common::Array + Common::Array<unsigned char> chunkData; pluto_persist(m_State, Chunkwriter, &chunkData); // Persistenzdaten in den Writer schreiben. |