fix zone transition

fix wilder allowed after new char


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

game/engine/Birther.lua

@@ -75,7 +75,7 @@ function _M:selectType(type)
 		local allowed = true
 		for j, od in ipairs(self.descriptors) do
 			if od.descriptor_choices[type] then
-				local what = od.descriptor_choices[type][d.name] or od.descriptor_choices[type].__ALL__
+				local what = util.getval(od.descriptor_choices[type][d.name]) or util.getval(od.descriptor_choices[type].__ALL__)
 				if what and what == "allow" then
 					allowed = true
 				elseif what and what == "never" then

game/engine/Zone.lua

@@ -56,6 +56,7 @@ function _M:leave()
 		save:saveZone(self)
 		save:close()
 	end
+	game.level = nil
 end
 
 --- Parses the npc/objects list and compute rarities for random generation

game/modules/tome/data/birth/classes/wilder.lua

@@ -10,8 +10,8 @@ newBirthDescriptor{
 		subclass =
 		{
 			__ALL__ = "never",
-			Summoner = config.settings.tome.allow_build.wilder_summoner and "allow" or "never",
-			Wyrmic = config.settings.tome.allow_build.wilder_wyrmic and "allow" or "never",
+			Summoner = function() return config.settings.tome.allow_build.wilder_summoner and "allow" or "never" end,
+			Wyrmic = function() return config.settings.tome.allow_build.wilder_wyrmic and "allow" or "never" end,
 		},
 	},
 	copy = {

game/modules/tome/data/birth/descriptors.lua

@@ -12,18 +12,19 @@ newBirthDescriptor{
 			Elf = "allow",
 			Dwarf = "allow",
 			Hobbit = "allow",
---			Orc = config.settings.tome.allow_build.evil and "allow" or "never",
---			Troll = config.settings.tome.allow_build.evil and "allow" or "never",
---			Spider = config.settings.tome.allow_build.spider and "allow" or "never",
+--			Orc = function() return config.settings.tome.allow_build.evil and "allow" or "never" end,
+--			Troll = function() return config.settings.tome.allow_build.evil and "allow" or "never" end,
+--			Spider = function() return config.settings.tome.allow_build.spider and "allow" or "never" end,
 		},
 
 		class =
 		{
 			__ALL__ = "allow",
-			Wilder = (
+			Wilder = function() return (
 				config.settings.tome.allow_build.wilder_summoner or
 				config.settings.tome.allow_build.wilder_wyrmic
-				) and "allow" or "never",
+				) and "allow" or "never"
+			end,
 		},
 	},
 	talents = {},