Fix an other UID issue, the last one I hope

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

game/engines/default/engine/Entity.lua

@@ -156,6 +156,8 @@ function _M:loaded()
 
 	-- hackish :/
 	if self.autoLoadedAI then self:autoLoadedAI() end
+
+	self:defineDisplayCallback()
 end
 
 --- Change the entity's uid
@@ -316,10 +318,6 @@ function _M:makeMapObject(tiles, idx)
 	return self._mo, self.z
 end
 
-function _M:loaded()
-	self:defineDisplayCallback()
-end
-
 --- Get all "map objects" representing this entity
 -- Do not touch unless you *KNOW* what you are doing.<br/>
 -- You do *NOT* need this, this is used by the engine.Map class automatically.<br/>

game/engines/default/engine/Projectile.lua

@@ -45,6 +45,8 @@ function _M:save()
 end
 
 function _M:loaded()
+	Entity.loaded(self)
+
 --	DPT: I think the line below should be there
 --	but somehow this causes projectiles to be duplicated on a chrono load
 --	self:defineDisplayCallback()

game/engines/default/engine/class.lua

@@ -317,7 +317,7 @@ function load(str, delayloading)
 --		print("setting obj class", obj.__CLASSNAME)
 		setmetatable(obj, {__index=require(obj.__CLASSNAME)})
 		if obj.loaded then
---			print("loader found for class", obj, obj.__CLASSNAME)
+--			print("loader found for class", obj, obj.__CLASSNAME, obj.loadNoDelay, obj.loaded, require(obj.__CLASSNAME).loaded)
 			if delayloading and not obj.loadNoDelay then
 				engine.Savefile.current_save:addDelayLoad(obj)
 			else