mff/mff_game
1
0
Fork 0
forked from minetest/minetest_game
Code Issues Pull Requests Releases Wiki Activity

Carts: Replace old, deprecated function names

Browse Source
This commit is contained in:
SmallJoker 2017-10-15 11:49:48 +02:00 committed by paramat
parent 47d6fbf884
commit 5870fd48f6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mods/carts/cart_entity.lua
View File

@ -57,8 +57,8 @@ function cart_entity:get_staticdata()
end end
function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities, direction) function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities, direction)
local pos = self.object:getpos() local pos = self.object:get_pos()
local vel = self.object:getvelocity() local vel = self.object:get_velocity()
if not self.railtype or vector.equals(vel, {x=0, y=0, z=0}) then if not self.railtype or vector.equals(vel, {x=0, y=0, z=0}) then
local node = minetest.get_node(pos).name local node = minetest.get_node(pos).name
self.railtype = minetest.get_item_group(node, "connect_to_raillike") self.railtype = minetest.get_item_group(node, "connect_to_raillike")
@ -81,7 +81,7 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities,
-- Detach driver and items -- Detach driver and items
if self.driver then if self.driver then
if self.old_pos then if self.old_pos then
self.object:setpos(self.old_pos) self.object:set_pos(self.old_pos)
end end
local player = minetest.get_player_by_name(self.driver) local player = minetest.get_player_by_name(self.driver)
carts:manage_attachment(player, nil) carts:manage_attachment(player, nil)
@ -99,7 +99,7 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities,
local leftover = inv:add_item("main", "carts:cart") local leftover = inv:add_item("main", "carts:cart")
-- If no room in inventory add a replacement cart to the world -- If no room in inventory add a replacement cart to the world
if not leftover:is_empty() then if not leftover:is_empty() then
minetest.add_item(self.object:getpos(), leftover) minetest.add_item(self.object:get_pos(), leftover)
end end
end end
self.object:remove() self.object:remove()
@ -152,7 +152,7 @@ local function rail_sound(self, dtime)
self.sound_handle = nil self.sound_handle = nil
minetest.after(0.2, minetest.sound_stop, handle) minetest.after(0.2, minetest.sound_stop, handle)
end end
local vel = self.object:getvelocity() local vel = self.object:get_velocity()
local speed = vector.length(vel) local speed = vector.length(vel)
if speed > 0 then if speed > 0 then
self.sound_handle = minetest.sound_play( self.sound_handle = minetest.sound_play(
@ -170,16 +170,16 @@ local function get_railparams(pos)
end end
local function rail_on_step(self, dtime) local function rail_on_step(self, dtime)
local vel = self.object:getvelocity() local vel = self.object:get_velocity()
if self.punched then if self.punched then
vel = vector.add(vel, self.velocity) vel = vector.add(vel, self.velocity)
self.object:setvelocity(vel) self.object:set_velocity(vel)
self.old_dir.y = 0 self.old_dir.y = 0
elseif vector.equals(vel, {x=0, y=0, z=0}) then elseif vector.equals(vel, {x=0, y=0, z=0}) then
return return
end end
local pos = self.object:getpos() local pos = self.object:get_pos()
local update = {} local update = {}
-- stop cart if velocity vector flips -- stop cart if velocity vector flips
@ -187,8 +187,8 @@ local function rail_on_step(self, dtime)
(self.old_vel.x * vel.x < 0 or self.old_vel.z * vel.z < 0) then (self.old_vel.x * vel.x < 0 or self.old_vel.z * vel.z < 0) then
self.old_vel = {x = 0, y = 0, z = 0} self.old_vel = {x = 0, y = 0, z = 0}
self.old_pos = pos self.old_pos = pos
self.object:setvelocity(vector.new()) self.object:set_velocity(vector.new())
self.object:setacceleration(vector.new()) self.object:set_acceleration(vector.new())
rail_on_step_event(get_railparams(pos).on_step, self, dtime) rail_on_step_event(get_railparams(pos).on_step, self, dtime)
return return
end end
@ -294,7 +294,7 @@ local function rail_on_step(self, dtime)
end end
end end
self.object:setacceleration(new_acc) self.object:set_acceleration(new_acc)
self.old_pos = vector.new(pos) self.old_pos = vector.new(pos)
if not vector.equals(dir, {x=0, y=0, z=0}) then if not vector.equals(dir, {x=0, y=0, z=0}) then
self.old_dir = vector.new(dir) self.old_dir = vector.new(dir)
@ -342,9 +342,9 @@ local function rail_on_step(self, dtime)
end end
self.object:set_animation(anim, 1, 0) self.object:set_animation(anim, 1, 0)
self.object:setvelocity(vel) self.object:set_velocity(vel)
if update.pos then if update.pos then
self.object:setpos(pos) self.object:set_pos(pos)
end end
-- call event handler -- call event handler