diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-21 14:56:03 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:50 +0200 |
| commit | 0bf3a15886ec881e77d7753d02e9ac76e401bdd9 (patch) | |
| tree | cfda3608b6f54e8fc9ed4a4db5f45e347f5d22a6 | |
| parent | cebc8c78a4f5c4a2d7bb246e44f7bd2599de9c9b (diff) | |
| download | minetest-0bf3a15886ec881e77d7753d02e9ac76e401bdd9.tar.gz minetest-0bf3a15886ec881e77d7753d02e9ac76e401bdd9.tar.bz2 minetest-0bf3a15886ec881e77d7753d02e9ac76e401bdd9.zip | |
Random Lua tweaks/fixes
| -rw-r--r-- | data/mods/default/init.lua | 8 | ||||
| -rw-r--r-- | src/scriptapi.cpp | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua index 4f825626d..b15315e24 100644 --- a/data/mods/default/init.lua +++ b/data/mods/default/init.lua @@ -715,12 +715,12 @@ function register_falling_node(nodename, texture) -- Set gravity self.object:setacceleration({x=0, y=-10, z=0}) -- Turn to actual sand when collides to ground or just move - pos = self.object:getpos() - bcp = {x=pos.x, y=pos.y-0.6, z=pos.z} -- Position of bottom center point - bcn = minetest.env:get_node(bcp) + local pos = self.object:getpos() + local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point + local bcn = minetest.env:get_node(bcp) if bcn.name ~= "air" then -- Turn to a sand node - np = {x=bcp.x, y=bcp.y+1, z=bcp.z} + local np = {x=bcp.x, y=bcp.y+1, z=bcp.z} minetest.env:add_node(np, {name=nodename}) self.object:remove() else diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index 02db2ce02..459719632 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -154,14 +154,17 @@ static void pushpos(lua_State *L, v3s16 p) static v3s16 readpos(lua_State *L, int index) { - v3s16 p; + // Correct rounding at <0 + v3f pf = readFloatPos(L, index); + return floatToInt(pf, BS); + /*v3s16 p; lua_getfield(L, index, "x"); p.X = lua_tonumber(L, -1); lua_getfield(L, index, "y"); p.Y = lua_tonumber(L, -1); lua_getfield(L, index, "z"); p.Z = lua_tonumber(L, -1); - return p; + return p;*/ } static void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef) |