Compare commits
No commits in common. "4a44a805763da8e4d234777f4f49ee0fbd9fb6ed" and "0a2e22cb7ccff883bffed4d1be6e66cef6285cd2" have entirely different histories.
4a44a80576
...
0a2e22cb7c
|
@ -67,8 +67,6 @@ local function detach_driver(self)
|
||||||
--print("No player object found for "..driver_name)
|
--print("No player object found for "..driver_name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
mod.detach_driver = detach_driver
|
|
||||||
|
|
||||||
function mod.kill_cart(staticdata, killer)
|
function mod.kill_cart(staticdata, killer)
|
||||||
local pos
|
local pos
|
||||||
mcl_log("cart #"..staticdata.uuid.." was killed")
|
mcl_log("cart #"..staticdata.uuid.." was killed")
|
||||||
|
@ -343,12 +341,11 @@ function DEFAULT_CART_DEF:on_step(dtime)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
if not staticdata.connected_at then
|
if not staticdata.connected_at then
|
||||||
do_detached_movement(self, dtime)
|
do_detached_movement(self, dtime)
|
||||||
else
|
|
||||||
mod.update_cart_orientation(self)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
mod.update_cart_orientation(self)
|
||||||
end
|
end
|
||||||
function DEFAULT_CART_DEF:on_death(killer)
|
function DEFAULT_CART_DEF:on_death(killer)
|
||||||
kill_cart(self._staticdata, killer)
|
kill_cart(self._staticdata, killer)
|
||||||
|
|
|
@ -7,7 +7,7 @@ local mod = mcl_minecarts
|
||||||
local PASSENGER_ATTACH_POSITION = mod.PASSENGER_ATTACH_POSITION
|
local PASSENGER_ATTACH_POSITION = mod.PASSENGER_ATTACH_POSITION
|
||||||
|
|
||||||
local function activate_normal_minecart(self)
|
local function activate_normal_minecart(self)
|
||||||
mod.detach_driver(self)
|
detach_driver(self)
|
||||||
|
|
||||||
-- Detach passenger
|
-- Detach passenger
|
||||||
if self._passenger then
|
if self._passenger then
|
||||||
|
|
|
@ -572,12 +572,6 @@ local function do_detached_movement(self, dtime)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Reset pitch if still not attached
|
|
||||||
local rot = self.object:get_rotation()
|
|
||||||
minetest.log(vector.to_string(rot))
|
|
||||||
rot.x = 0
|
|
||||||
self.object:set_rotation(rot)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--return do_movement, do_detatched_movement
|
--return do_movement, do_detatched_movement
|
||||||
|
|
Loading…
Reference in New Issue