libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 14:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SWORD25: Use direct integer index into indexTbl

Browse Source 
This matches the behaviour of the Pluto rewrite Eris, and avoids
casting the integer indices to void *.

I verified this code by running this method in parallel with the current
lightuserdata/void* approach and asserting the retrieved objects were
identical when loading a savegame.
This commit is contained in:
Willem Jan Palenstijn 2017-01-28 18:47:11 +01:00
parent 0a5e36d689
commit c3d533a72b
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/sword25/util/lua_unpersist.cpp
View File

@ -116,16 +116,13 @@ static void registerObjectInIndexTable(UnSerializationInfo *info, int index) {
// >>>>> permTbl indexTbl ...... obj
// Make sure there is enough room on the stack
lua_checkstack(info->luaState, 2);
lua_checkstack(info->luaState, 1);
lua_pushlightuserdata(info->luaState, (void *)index);
// >>>>> permTbl indexTbl ...... obj index
lua_pushvalue(info->luaState, -2);
// >>>>> permTbl indexTbl ...... obj index obj
lua_pushvalue(info->luaState, -1);
// >>>>> permTbl indexTbl ...... obj obj
// Push the k/v pair into the indexTbl
lua_settable(info->luaState, 2);
lua_rawseti(info->luaState, 2, index);
// >>>>> permTbl indexTbl ...... obj
}
@ -198,10 +195,7 @@ static void unpersist(UnSerializationInfo *info) {
} else {
// Fetch the object from the indexTbl
lua_pushlightuserdata(info->luaState, (void *)index);
// >>>>> permTbl indexTbl ...... index
lua_gettable(info->luaState, 2);
lua_rawgeti(info->luaState, 2, index);
// >>>>> permTbl indexTbl ...... ?obj?
assert(!lua_isnil(info->luaState, -1));