Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-28 05:21:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Restore 45 degree cart movement, remove warning about unknown global

Browse source
This commit is contained in:
teknomunk 2024-04-28 08:09:42 +00:00
parent 4ed0fe6a74
commit db2f02b485
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
mods/ENTITIES/mcl_minecarts/functions.lua
View file

@ -301,9 +301,8 @@ local function is_ahead_slope(pos, dir)
local node_name = force_get_node(below).name local node_name = force_get_node(below).name
return minetest.get_item_group(node_name, "rail_slope") ~= 0 return minetest.get_item_group(node_name, "rail_slope") ~= 0
end end
function mcl_minecarts:get_rail_direction(pos_, dir)
local pos = vector.round(pos_)
local function get_rail_direction_inner(pos, dir)
-- Handle new track types that have track-specific direction handler -- Handle new track types that have track-specific direction handler
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local node_def = minetest.registered_nodes[node.name] local node_def = minetest.registered_nodes[node.name]
@ -328,6 +327,42 @@ function mcl_minecarts:get_rail_direction(pos_, dir)
return dir return dir
end end
function mcl_minecarts:get_rail_direction(pos_, dir)
local pos = vector.round(pos_)
-- diagonal direction handling
if dir.x ~= 0 and dir.z ~= 0 then
-- Check both possible diagonal movements
local dir_a = vector.new(dir.x,0,0)
local dir_b = vector.new(0,0,dir.z)
local new_dir_a = mcl_minecarts:get_rail_direction(pos, dir_a)
local new_dir_b = mcl_minecarts:get_rail_direction(pos, dir_b)
-- If either is the same diagonal direction, continue as you were
if vector.equals(dir,new_dir_a) or vector.equals(dir,new_dir_b) then
return dir
-- Otherwise, if either would try to move in the same direction as
-- what tried, move that direction
elseif vector.equals(dir_a, new_dir_a) then
return new_dir_a
elseif vector.equals(dir_b, new_dir_b) then
return new_dir_b
end
-- And if none of these were true, fall thru into standard behavior
end
local new_dir = get_rail_direction_inner(pos, dir)
-- Check four 45 degree movement
local next_rails_dir = get_rail_direction_inner(vector.add(pos, new_dir), new_dir)
if vector.equals(next_rails_dir, dir) and not vector.equals(new_dir, next_rails_dir) then
return vector.add(new_dir, next_rails_dir)
else
return new_dir
end
end
function mod.update_cart_orientation(self) function mod.update_cart_orientation(self)
local staticdata = self._staticdata local staticdata = self._staticdata

2
mods/ENTITIES/mcl_minecarts/movement.lua
View file

@ -531,7 +531,7 @@ local function do_detached_movement(self, dtime)
} }
for i=1,#test_positions do for i=1,#test_positions do
test_pos = test_positions[i] local test_pos = test_positions[i]
local pos_r = vector.round(test_pos) local pos_r = vector.round(test_pos)
local node = minetest.get_node(pos_r) local node = minetest.get_node(pos_r)
if minetest.get_item_group(node.name, "rail") ~= 0 then if minetest.get_item_group(node.name, "rail") ~= 0 then