hum

git-svn-id: http://svn.net-core.org/repos/t-engine4@6239 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Entity.lua

@@ -690,7 +690,7 @@ end
 function _M:removeTemporaryValue(prop, id, noupdate)
 	local oldval = self.compute_vals[id]
 	print("removeTempVal", prop, oldval, " :=: ", id)
-	if not id then error("error removing prop "..tostring(prop).." with id nil") end
+	if not id then util.send_error_backtrace("error removing prop "..tostring(prop).." with id nil") return end
 	self.compute_vals[id] = nil
 
 	-- Find the base, one removed from the last prop
@@ -746,7 +746,7 @@ function _M:removeTemporaryValue(prop, id, noupdate)
 				base[prop] = b[1] and b[1][2]
 				if not next(base["__tlast_"..prop]) then base["__tlast_"..prop] = nil end
 			else
-				if not base[prop] then error("Error removing property "..tostring(prop).." with value "..tostring(v).." : base[prop] is nil") end
+				if not base[prop] then util.send_error_backtrace("Error removing property "..tostring(prop).." with value "..tostring(v).." : base[prop] is nil") return end
 				base[prop] = base[prop] - v
 			end
 			self:onTemporaryValueChange(prop, -v, base)
@@ -757,10 +757,9 @@ function _M:removeTemporaryValue(prop, id, noupdate)
 			end
 		else
 			if type(v) == "nil" then
-				print("ERROR!!! unsupported temporary value type: "..type(v).." :=: "..tostring(v))
-				util.show_backtrace()
+				util.send_error_backtrace("ERROR!!! unsupported temporary value type: "..type(v).." :=: "..tostring(v))
 			else
-				error("unsupported temporary value type: "..type(v).." :=: "..tostring(v))
+				util.send_error_backtrace("unsupported temporary value type: "..type(v).." :=: "..tostring(v))
 			end
 		end
 	end

game/engines/default/engine/utils.lua

@@ -1939,6 +1939,21 @@ function util.show_backtrace()
 	end
 end
 
+function util.send_error_backtrace(msg)
+	local level = 2
+	local trace = {}
+
+	trace[#trace+1] = "backtrace:"
+	while true do
+		local stacktrace = debug.getinfo(level, "nlS")
+		if stacktrace == nil then break end
+		trace[#trace+1] = (("    function: %s (%s) at %s:%d"):format(stacktrace.name or "???", stacktrace.what, stacktrace.source or stacktrace.short_src or "???", stacktrace.currentline))
+		level = level + 1
+	end
+
+	profile:sendError(msg, table.concat(trace, "\n"))
+end
+
 function util.uuid()
 	local x = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}
 	local y = {'8', '9', 'a', 'b'}

game/modules/tome/data/general/npcs/horror.lua

@@ -277,7 +277,7 @@ newEntity{ base = "BASE_NPC_HORROR", define_as = "BASE_NPC_ELDRICTH_EYE",
 
 		-- Blind the main horror if no more eyes
 		local nb = 0
-		for eye, _ in pairs(self.summoner.eyes) do
+		for eye, _ in pairs(self.summoner.eyes or {}) do
 			if not eye.dead then nb = nb + 1 end
 		end
 		if nb == 0 then

game/modules/tome/data/zones/temporal-rift/npcs.lua

@@ -131,7 +131,7 @@ local twin_take_hit = function(self, value, src)
 		local o = self.brother.onTakeHit
 		self.brother.onTakeHit = nil
 		self.brother:takeHit(value, src)
-		self.brother.onTakeHit = o
+		if self.brother then self.brother.onTakeHit = o end
 	end
 	return value
 end