From 741df993ff33832d773536ed571c1a67ed93b5cb Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Thu, 2 Oct 2014 15:58:13 -0400 Subject: Fix object reference pushing functions when called from coroutines --- src/script/cpp_api/s_inventory.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/script/cpp_api/s_inventory.cpp') diff --git a/src/script/cpp_api/s_inventory.cpp b/src/script/cpp_api/s_inventory.cpp index f423a9f33..422faf150 100644 --- a/src/script/cpp_api/s_inventory.cpp +++ b/src/script/cpp_api/s_inventory.cpp @@ -47,7 +47,7 @@ int ScriptApiDetached::detached_inventory_AllowMove( lua_pushstring(L, to_list.c_str()); // to_list lua_pushinteger(L, to_index + 1); // to_index lua_pushinteger(L, count); // count - objectrefGetOrCreate(player); // player + objectrefGetOrCreate(L, player); // player if (lua_pcall(L, 7, 1, m_errorhandler)) scriptError(); if(!lua_isnumber(L, -1)) @@ -76,7 +76,7 @@ int ScriptApiDetached::detached_inventory_AllowPut( lua_pushstring(L, listname.c_str()); // listname lua_pushinteger(L, index + 1); // index LuaItemStack::create(L, stack); // stack - objectrefGetOrCreate(player); // player + objectrefGetOrCreate(L, player); // player if (lua_pcall(L, 5, 1, m_errorhandler)) scriptError(); if (!lua_isnumber(L, -1)) @@ -105,7 +105,7 @@ int ScriptApiDetached::detached_inventory_AllowTake( lua_pushstring(L, listname.c_str()); // listname lua_pushinteger(L, index + 1); // index LuaItemStack::create(L, stack); // stack - objectrefGetOrCreate(player); // player + objectrefGetOrCreate(L, player); // player if (lua_pcall(L, 5, 1, m_errorhandler)) scriptError(); if (!lua_isnumber(L, -1)) @@ -138,7 +138,7 @@ void ScriptApiDetached::detached_inventory_OnMove( lua_pushstring(L, to_list.c_str()); // to_list lua_pushinteger(L, to_index + 1); // to_index lua_pushinteger(L, count); // count - objectrefGetOrCreate(player); // player + objectrefGetOrCreate(L, player); // player if (lua_pcall(L, 7, 0, m_errorhandler)) scriptError(); } @@ -163,7 +163,7 @@ void ScriptApiDetached::detached_inventory_OnPut( lua_pushstring(L, listname.c_str()); // listname lua_pushinteger(L, index + 1); // index LuaItemStack::create(L, stack); // stack - objectrefGetOrCreate(player); // player + objectrefGetOrCreate(L, player); // player if (lua_pcall(L, 5, 0, m_errorhandler)) scriptError(); } @@ -188,7 +188,7 @@ void ScriptApiDetached::detached_inventory_OnTake( lua_pushstring(L, listname.c_str()); // listname lua_pushinteger(L, index + 1); // index LuaItemStack::create(L, stack); // stack - objectrefGetOrCreate(player); // player + objectrefGetOrCreate(L, player); // player if (lua_pcall(L, 5, 0, m_errorhandler)) scriptError(); } -- cgit v1.2.3