From ac628c9b0ab8c69313b3fe401384ecd0fc20eb14 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 9 Sep 2012 12:05:38 +0300 Subject: [PATCH] Fix ObjectRef:punch() --- doc/lua_api.txt | 1 + src/scriptapi.cpp | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index b71b6d62c..782378c1f 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1087,6 +1087,7 @@ methods: - punch(puncher, time_from_last_punch, tool_capabilities, direction) ^ puncher = an another ObjectRef, ^ time_from_last_punch = time since last punch action of the puncher + ^ direction: can be nil - right_click(clicker); clicker = an another ObjectRef - get_hp(): returns number of hitpoints (2 * number of hearts) - set_hp(hp): set number of hitpoints (2 * number of hearts) diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index 81e96aec6..39e2a46e4 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -2542,7 +2542,7 @@ private: return 0; } - // punch(self, puncher, tool_capabilities, direction, time_from_last_punch) + // punch(self, puncher, time_from_last_punch, tool_capabilities, dir) static int l_punch(lua_State *L) { ObjectRef *ref = checkobject(L, 1); @@ -2551,13 +2551,18 @@ private: ServerActiveObject *puncher = getobject(puncher_ref); if(co == NULL) return 0; if(puncher == NULL) return 0; - ToolCapabilities toolcap = read_tool_capabilities(L, 3); - v3f dir = read_v3f(L, 4); + v3f dir; + if(lua_type(L, 5) != LUA_TTABLE) + dir = co->getBasePosition() - puncher->getBasePosition(); + else + dir = read_v3f(L, 5); float time_from_last_punch = 1000000; - if(lua_isnumber(L, 5)) - time_from_last_punch = lua_tonumber(L, 5); + if(lua_isnumber(L, 3)) + time_from_last_punch = lua_tonumber(L, 3); + ToolCapabilities toolcap = read_tool_capabilities(L, 4); + dir.normalize(); // Do it - puncher->punch(dir, &toolcap, puncher, time_from_last_punch); + co->punch(dir, &toolcap, puncher, time_from_last_punch); return 0; }