Fix depercated functions

3 files changed, 15 insertions, 13 deletions

diff --git a/advtrains/couple.lua b/advtrains/couple.lua
index cbeb661..795419c 100644
--- a/advtrains/couple.lua
+++ b/advtrains/couple.lua
@@ -453,7 +453,7 @@ minetest.register_entity("advtrains:discouple", {
 				self.object:remove()
 				return
 			end
-			--getyaw seems to be a reliable method to check if an object is loaded...if it returns nil, it is not.
+			--get_yaw seems to be a reliable method to check if an object is loaded...if it returns nil, it is not.
 			if not self.wagon.object:get_yaw() then
 				self.object:remove()
 				return
@@ -500,7 +500,7 @@ minetest.register_entity("advtrains:couple", {
 		self.object:remove()
 	end,
 	on_step=function(self, dtime)
-		if advtrains.wagon_outside_range(self.object:getpos()) then
+		if advtrains.wagon_outside_range(self.object:get_pos()) then
 			--atdebug("Couple Removing outside range")
 			self.object:remove()
 			return
@@ -539,7 +539,7 @@ minetest.register_entity("advtrains:couple", {
 				tp2=advtrains.path_get_interpolated(train2, train2.end_index)
 			end
 			local pos_median=advtrains.pos_median(tp1, tp2)
-			if not vector.equals(pos_median, self.object:getpos()) then
+			if not vector.equals(pos_median, self.object:get_pos()) then
 				self.object:set_pos(pos_median)
 			end
 			self.position_set=true
diff --git a/advtrains/trainhud.lua b/advtrains/trainhud.lua
index f9f4876..ce4b913 100644
--- a/advtrains/trainhud.lua
+++ b/advtrains/trainhud.lua
@@ -10,6 +10,8 @@ advtrains.hud[player:get_player_name()] = nil
 advtrains.hhud[player:get_player_name()] = nil
 end)
 
+local hud_type_key = minetest.features.hud_def_type_field and "type" or "hud_elem_type"
+
 local mletter={[1]="F", [-1]="R", [0]="N"}
 
 function advtrains.on_control_change(pc, train, flip)
@@ -105,7 +107,7 @@ function advtrains.set_trainhud(name, text, driver)
 	end
 	local drivertext = driver or ""
 	local driverhud = {
-		hud_elem_type = "image",
+		[hud_type_key] = "image",
 		name = "ADVTRAINS_DRIVER",
 		position = {x=0.5, y=1},
 		offset = {x=0,y=-170},
@@ -116,8 +118,8 @@ function advtrains.set_trainhud(name, text, driver)
 	if not hud then
 		hud = {}
 		advtrains.hud[name] = hud
-		hud.id = player:hud_add {
-			hud_elem_type = "text",
+		hud.id = player:hud_add({
+			[hud_type_key] = "text",
 			name = "ADVTRAINS",
 			number = 0xFFFFFF,
 			position = {x=0.5, y=1},
@@ -125,7 +127,7 @@ function advtrains.set_trainhud(name, text, driver)
 			text = text,
 			scale = {x=200, y=60},
 			alignment = {x=0, y=-1},
-		}
+		})
 		hud.driver = player:hud_add(driverhud)
 		hud.oldText = text
 		hud.oldDriver = drivertext
@@ -156,7 +158,7 @@ function advtrains.set_help_hud(name, text)
 		hud = {}
 		advtrains.hhud[name] = hud
 		hud.id = player:hud_add({
-			hud_elem_type = "text",
+			[hud_type_key] = "text",
 			name = "ADVTRAINS_HELP",
 			number = 0xFFFFFF,
 			position = {x=1, y=0.3},
diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua
index 8bb12ee..cf15871 100644
--- a/advtrains/wagons.lua
+++ b/advtrains/wagons.lua
@@ -286,7 +286,7 @@ function wagon:on_step(dtime)
 		local data = advtrains.wagons[self.id]
 		
 		if not pos then
-			--atdebug("["..self.id.."][fatal] missing position (object:getpos() returned nil)")
+			--atdebug("["..self.id.."][fatal] missing position (object:get_pos() returned nil)")
 			return
 		end
 		
@@ -820,8 +820,8 @@ function wagon:get_off(seatno)
 		end
 		--if not door_entry, or paths missing, fall back to old method
 		--atdebug("using fallback")
-		local objpos=advtrains.round_vector_floor_y(self.object:getpos())
-		local yaw=self.object:getyaw()
+		local objpos=advtrains.round_vector_floor_y(self.object:get_pos())
+		local yaw=self.object:get_yaw()
 		local isx=(yaw < math.pi/4) or (yaw > 3*math.pi/4 and yaw < 5*math.pi/4) or (yaw > 7*math.pi/4)
 		local offp
 		--abuse helper function
@@ -899,7 +899,7 @@ end
 
 --BordCom
 local function checkcouple(ent)
-	if not ent or not ent:getyaw() then
+	if not ent or not ent:get_yaw() then
 		return nil
 	end
 	local le = ent:get_luaentity()
@@ -1273,7 +1273,7 @@ function wagon:check_seat_group_access(pname, sgr)
 		return false, attrans("You are not allowed to access the driver stand.")
 	end
 	if self.seat_groups[sgr].driving_ctrl_access then
-		advtrains.log("Drive", pname, self.object:getpos(), self:train().text_outside)
+		advtrains.log("Drive", pname, self.object:get_pos(), self:train().text_outside)
 	end
 	return true
 end