prevents a memory leak, maps never garbage collected

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

game/engine/Entity.lua

@@ -16,7 +16,7 @@ setmetatable(__uids, {__mode="v"})
 function _M:init(t)
 	t = t or {}
 	self.uid = next_uid
-	__uids[self.uid] = self
+--	__uids[self.uid] = self
 
 	for k, e in pairs(t) do self[k] = e end
 
@@ -37,7 +37,7 @@ end
 -- If we are cloned we need a new uid
 function _M:cloned()
 	self.uid = next_uid
-	__uids[self.uid] = self
+--	__uids[self.uid] = self
 	next_uid = next_uid + 1
 end
 

game/engine/Level.lua

@@ -10,7 +10,6 @@ function _M:init(level, map)
 	self.entities = {}
 end
 
-
 --- Adds an entity to the level
 -- Only entities that need to act need to be added. Terrain features do not need this usualy
 function _M:addEntity(e)

game/engine/Map.lua

@@ -38,8 +38,8 @@ function _M:init(w, h)
 	self.lites = {}
 	self.seens = {}
 	self.remembers = {}
-	for i = 0, w * h - 1 do self.map[i] = {} end
 	getmetatable(self).__call = _M.call
+	for i = 0, w * h - 1 do self.map[i] = {} end
 	local mapbool = function(t, x, y, v)
 		if x < 0 or y < 0 or x >= self.w or y >= self.h then return end
 		if v ~= nil then
@@ -57,6 +57,15 @@ function _M:init(w, h)
 	self.changed = true
 end
 
+--- Closes things in the object to allow it to be garbage collected
+-- Map objects are NOT automatically garbage collected because they contain FOV C structure, which themselves have a reference
+-- to the map. Cyclic references! BAD BAD BAD !<br/>
+-- The closing should be handled automatically by the Zone class so no bother for authors
+function _M:close()
+	self._fov = false
+	self._fov_lite = false
+end
+
 --- Runs the FOV algorithm on the map
 -- @param x source point of the ligth
 -- @param y source point of the ligth
@@ -237,3 +246,4 @@ function _M:rememberAll(x, y, w, h)
 		self.remembers(i, j, true)
 	end end
 end
+

game/engine/Zone.lua

@@ -49,7 +49,12 @@ end
 --- Asks the zone to generate a level of level "lev"
 -- @param lev the level (from 1 to zone.max_level)
 -- @return a Level object
-function _M:getLevel(game, lev)
+function _M:getLevel(game, lev, no_close)
+	-- Before doing anything else, close the current level
+	if not no_close and game.level and game.level.map then
+		game.level.map:close()
+	end
+
 	local level_data = self:getLevelData(lev)
 
 	local map = self.map_class.new(level_data.width, level_data.height)
@@ -81,6 +86,9 @@ function _M:getLevel(game, lev)
 		generator:generate()
 	end
 
+	-- Setup the level in the game
+	game:setLevel(level)
+
 	-- Clean up things
 	collectgarbage("collect")
 

game/engine/init.lua

@@ -22,6 +22,7 @@ key:addCommand(key._RETURN, {"alt"}, function() core.display.fullscreen() end)
 game = false
 local mod_def = loadfile("/mod/init.lua")
 if mod_def then
+	-- Call the file body inside its own private environment
 	local mod = {}
 	setfenv(mod_def, mod)
 	mod_def()

game/modules/tome/class/Game.lua

@@ -57,7 +57,6 @@ function _M:display()
 		if self.level.map.changed then
 			self.level.map:fov(self.player.x, self.player.y, 20)
 			self.level.map:fovLite(self.player.x, self.player.y, 4)
---			core.fov.calc_circle(15,15, 7, self.level.map.opaque, self.level.map.apply, self.level.map)
 		end
 		local s = self.level.map:display()
 		if s then