BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix CSM crash (#5779)

Browse Source 
Caused by dc5bc6c and them made worse by 5ebf8f9
This commit is contained in:
red-001 2017-05-20 15:45:49 +01:00 committed by Loïc Blot
parent 7e185068c4
commit 772944daf6
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/client_lua_api.md
View File

@ -202,7 +202,7 @@ For helper functions see "Vector helpers".
### pointed_thing ### pointed_thing
* `{type="nothing"}` * `{type="nothing"}`
* `{type="node", under=pos, above=pos}` * `{type="node", under=pos, above=pos}`
* `{type="object", ref=ObjectRef}` * `{type="object", id=ObjectID}`
Flag Specifier Format Flag Specifier Format
--------------------- ---------------------

8
src/script/common/c_content.cpp
View File

@ -1441,7 +1441,7 @@ void read_json_value(lua_State *L, Json::Value &root, int index, u8 recursion)
lua_pop(L, 1); // Pop value lua_pop(L, 1); // Pop value
} }
void push_pointed_thing(lua_State *L, const PointedThing &pointed) void push_pointed_thing(lua_State *L, const PointedThing &pointed, bool csm)
{ {
lua_newtable(L); lua_newtable(L);
if (pointed.type == POINTEDTHING_NODE) { if (pointed.type == POINTEDTHING_NODE) {
@ -1454,8 +1454,14 @@ void push_pointed_thing(lua_State *L, const PointedThing &pointed)
} else if (pointed.type == POINTEDTHING_OBJECT) { } else if (pointed.type == POINTEDTHING_OBJECT) {
lua_pushstring(L, "object"); lua_pushstring(L, "object");
lua_setfield(L, -2, "type"); lua_setfield(L, -2, "type");
if (csm) {
lua_pushinteger(L, pointed.object_id);
lua_setfield(L, -2, "id");
} else {
push_objectRef(L, pointed.object_id); push_objectRef(L, pointed.object_id);
lua_setfield(L, -2, "ref"); lua_setfield(L, -2, "ref");
}
} else { } else {
lua_pushstring(L, "nothing"); lua_pushstring(L, "nothing");
lua_setfield(L, -2, "type"); lua_setfield(L, -2, "type");

2
src/script/common/c_content.h
View File

@ -164,7 +164,7 @@ bool push_json_value (lua_State *L,
void read_json_value (lua_State *L, Json::Value &root, void read_json_value (lua_State *L, Json::Value &root,
int index, u8 recursion = 0); int index, u8 recursion = 0);
void push_pointed_thing (lua_State *L, const PointedThing &pointed); void push_pointed_thing (lua_State *L, const PointedThing &pointed, bool csm = false);
void push_objectRef (lua_State *L, const u16 id); void push_objectRef (lua_State *L, const u16 id);

4
src/script/cpp_api/s_client.cpp
View File

@ -199,7 +199,7 @@ bool ScriptApiClient::on_placenode(const PointedThing &pointed, const ItemDefini
lua_getfield(L, -1, "registered_on_placenode"); lua_getfield(L, -1, "registered_on_placenode");
// Push data // Push data
push_pointed_thing(L, pointed); push_pointed_thing(L, pointed, true);
push_item_definition(L, item); push_item_definition(L, item);
// Call functions // Call functions
@ -217,7 +217,7 @@ bool ScriptApiClient::on_item_use(const ItemStack &item, const PointedThing &poi
// Push data // Push data
LuaItemStack::create(L, item); LuaItemStack::create(L, item);
push_pointed_thing(L, pointed); push_pointed_thing(L, pointed, true);
// Call functions // Call functions
runCallbacks(2, RUN_CALLBACKS_MODE_OR); runCallbacks(2, RUN_CALLBACKS_MODE_OR);