fix

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

game/engine/Entity.lua

@@ -378,10 +378,10 @@ function _M:loadList(file, no_default, res, mod, loaded)
 
 				for k, e in pairs(res[t.base]) do
 					if k ~= "define_as" and type(k) ~= "number" then
-						if type(t[k]) == "nil" then
-							t[k] = e
-						elseif type(t[k]) == "table" and type(e) == "table" then
+						if type(t[k]) == "table" and type(e) == "table" then
 							copy_recurs(t[k], e)
+						elseif not t[k] and type(t[k]) ~= "boolean" then
+							t[k] = e
 						end
 					end
 				end

game/engine/interface/ActorInventory.lua

@@ -310,6 +310,7 @@ function _M:wearObject(o, replace, vocal)
 		return false
 	end
 	if o:check("on_canwear", self, inven) then return false end
+	local offslot = self:getObjectOffslot(o)
 
 	if self:addObject(inven, o) then
 		if vocal then game.logSeen(self, "%s wears: %s.", self.name:capitalize(), o:getName{do_color=true}) end