diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 15:34:28 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 15:34:28 +0100 |
| commit | c70c6d19c1cabf46b595591802bceab63d371788 (patch) | |
| tree | 1c153d2bfe560171bad5889d528dc5cf110e8533 /src/scripting/luautil.cpp | |
| parent | d707495540581f8c1b9ab3d5007c9c4d1ab83b53 (diff) | |
| parent | 587b7682e6bf7dd9e616c1d4789a5ed9aa986e6d (diff) | |
| download | manaserv-c70c6d19c1cabf46b595591802bceab63d371788.tar.gz manaserv-c70c6d19c1cabf46b595591802bceab63d371788.tar.bz2 manaserv-c70c6d19c1cabf46b595591802bceab63d371788.tar.xz manaserv-c70c6d19c1cabf46b595591802bceab63d371788.zip | |
Merge branch 'master' into lpc2012
Conflicts:
gameserver.cbp
src/account-server/accounthandler.cpp
src/game-server/attack.cpp
src/game-server/attack.h
src/game-server/being.cpp
src/game-server/being.h
src/game-server/character.cpp
src/game-server/character.h
src/game-server/inventory.cpp
src/game-server/item.h
src/game-server/monster.cpp
src/game-server/monster.h
Diffstat (limited to 'src/scripting/luautil.cpp')
| -rw-r--r-- | src/scripting/luautil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp index 3de23c77..f7b39e29 100644 --- a/src/scripting/luautil.cpp +++ b/src/scripting/luautil.cpp @@ -86,8 +86,8 @@ void UserDataCache::insert(lua_State *s, void *object) // The metatable that makes the values in the table above weak lua_newtable(s); // UD, Cache, {} - lua_pushstring(s, "__mode"); - lua_pushstring(s, "v"); + lua_pushliteral(s, "__mode"); + lua_pushliteral(s, "v"); lua_rawset(s, -3); // UD, Cache, { __mode = "v" } lua_setmetatable(s, -2); // UD, Cache |