aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-06-08 01:51:23 +0300
committerPerttu Ahola <celeron55@gmail.com>2012-06-08 01:51:23 +0300
commit22502f80db7236680e2ce18ee8a4fc59f4c9c8e7 (patch)
treefd19309f7a1fdef35fd7a6c40a286d9f6e27b3a7
parent4b2cc38abaa9b4d19e6e483c811c58f79cc86584 (diff)
downloadminetest-22502f80db7236680e2ce18ee8a4fc59f4c9c8e7.tar.gz
minetest-22502f80db7236680e2ce18ee8a4fc59f4c9c8e7.tar.bz2
minetest-22502f80db7236680e2ce18ee8a4fc59f4c9c8e7.zip
Don't deprecate minetest.register_on_placenode and minetest.register_on_dignode
-rw-r--r--builtin/misc_register.lua15
1 files changed, 2 insertions, 13 deletions
diff --git a/builtin/misc_register.lua b/builtin/misc_register.lua
index d400b09c3..8d4e61fef 100644
--- a/builtin/misc_register.lua
+++ b/builtin/misc_register.lua
@@ -302,6 +302,8 @@ end
minetest.registered_on_chat_messages, minetest.register_on_chat_message = make_registration()
minetest.registered_globalsteps, minetest.register_globalstep = make_registration()
minetest.registered_on_punchnodes, minetest.register_on_punchnode = make_registration()
+minetest.registered_on_placenodes, minetest.register_on_placenode = make_registration()
+minetest.registered_on_dignodes, minetest.register_on_dignode = make_registration()
minetest.registered_on_generateds, minetest.register_on_generated = make_registration()
minetest.registered_on_newplayers, minetest.register_on_newplayer = make_registration()
minetest.registered_on_dieplayers, minetest.register_on_dieplayer = make_registration()
@@ -309,16 +311,3 @@ minetest.registered_on_respawnplayers, minetest.register_on_respawnplayer = make
minetest.registered_on_joinplayers, minetest.register_on_joinplayer = make_registration()
minetest.registered_on_leaveplayers, minetest.register_on_leaveplayer = make_registration()
-minetest.registered_on_placenodes = {}
-minetest.register_on_placenode = function(callback)
- minetest.log("info", debug.traceback())
- minetest.log("info", "WARNING: minetest.register_on_placenode is deprecated. Use on_construct or after_place_node in node definition instead.")
- table.insert(minetest.registered_on_placenodes, callback)
-end
-minetest.registered_on_dignodes = {}
-minetest.register_on_dignode = function(callback)
- minetest.log("info", debug.traceback())
- minetest.log("info", "WARNING: minetest.register_on_dignode is deprecated. Use on_destruct or after_dig_node in node definition instead.")
- table.insert(minetest.registered_on_dignodes, callback)
-end
-
href='#n175'>175 176 177 178 179 180
--couple.lua
--defines couple entities.

--advtrains:discouple
--set into existing trains to split them when punched.
--they are attached to the wagons.
--[[fields
wagon

wagons keep their couple entity minetest-internal id inside the field discouple_id. if it refers to nowhere, they will spawn a new one if player is near
]]

local couple_max_dist=3

minetest.register_entity("advtrains:discouple", {
	visual="sprite",
	textures = {"advtrains_discouple.png"},
	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
	visual_size = {x=1, y=1},
	initial_sprite_basepos = {x=0, y=0},
	
	is_discouple=true,
	on_activate=function(self, staticdata) 
		if staticdata=="DISCOUPLE" then
			--couple entities have no right to exist further...
			atprint("Discouple loaded from staticdata, destroying")
			self.object:remove()
			return
		end
		self.object:set_armor_groups({immortal=1})
	end,
	get_staticdata=function() return "DISCOUPLE" end,
	on_punch=function(self, player)
		return advtrains.pcall(function()
			--only if player owns at least one wagon next to this
			local own=player:get_player_name()
			if self.wagon.owner and self.wagon.owner==own and not self.wagon.lock_couples then
				local train=advtrains.trains[self.wagon.train_id]
				local nextwgn_id=train.trainparts[self.wagon.pos_in_trainparts-1]
				for aoi, le in pairs(minetest.luaentities) do
					if le and le.is_wagon then
						if le.unique_id==nextwgn_id then
							if le.owner and le.owner~=own then
								minetest.chat_send_player(own, attrans("You need to own at least one neighboring wagon to destroy this couple."))
								return
							end
						end
					end
				end
				atprint("Discouple punched. Splitting train", self.wagon.train_id)
				advtrains.split_train_at_wagon(self.wagon)--found in trainlogic.lua
				self.object:remove()
			elseif self.wagon.lock_couples then
				minetest.chat_send_player(own, "Couples of one of the wagons are locked, can't discouple!")
			else
				minetest.chat_send_player(own, attrans("You need to own at least one neighboring wagon to destroy this couple."))
			end
		end)
	end,
	on_step=function(self, dtime)
		return advtrains.pcall(function()
			local t=os.clock()
			if not self.wagon then
				self.object:remove()
				atprint("Discouple: no wagon, destroying")
				return
			end
			--getyaw 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:getyaw() then
				atprint("Discouple: wagon no longer loaded, destroying")
				self.object:remove()
				return
			end
			local velocityvec=self.wagon.object:getvelocity()
			self.updatepct_timer=(self.updatepct_timer or 0)-dtime
			if not self.old_velocity_vector or not vector.equals(velocityvec, self.old_velocity_vector) or self.updatepct_timer<=0 then--only send update packet if something changed
				local flipsign=self.wagon.wagon_flipped and -1 or 1
				self.object:setpos(vector.add(self.wagon.object:getpos(), {y=0, x=-math.sin(self.wagon.object:getyaw())*self.wagon.wagon_span*flipsign, z=math.cos(self.wagon.object:getyaw())*self.wagon.wagon_span*flipsign}))
				self.object:setvelocity(velocityvec)
				self.updatepct_timer=2
			end
			atprintbm("discouple_step", t)
		end)
	end,
})

--advtrains:couple
--when two trains overlap with their end-positions, this entity will be spawned and both trains set its id into appropiate fields for them to know when to free them again. The entity will destroy automatically when it recognizes that any of the trains left the common position. 
--[[fields
train_id_1
train_id_2
train1_is_backpos
train2_is_backpos
]]


minetest.register_entity("advtrains:couple", {
	visual="sprite",
	textures = {"advtrains_couple.png"},
	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
	visual_size = {x=1, y=1},
	initial_sprite_basepos = {x=0, y=0},
	
	is_couple=true,
	on_activate=function(self, staticdata)
		return advtrains.pcall(function()
			if staticdata=="COUPLE" then
				--couple entities have no right to exist further...