close .. we are close

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

game/modules/tome/class/FortressPC.lua

@@ -233,10 +233,10 @@ end
 
 function _M:takeControl(from)
 	game:onTickEnd(function()
+		from:attr("dont_act", 1)
 		game.party:addMember(self, {temporary_level=1, control="full"})
 		game.party:setPlayer(self, true)
 		game.level.map:remove(from.x, from.y, engine.Map.ACTOR)
-		from:attr("dont_act", 1)
 	end)
 end
 

game/modules/tome/class/Game.lua

@@ -1296,14 +1296,13 @@ function _M:setupCommands()
 			print("===============")
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
-			game.level.map:particleEmitter(game.player.x, game.player.y, 1, "burning-steam", {})
+			self:registerDialog(require("mod.dialogs.DownloadCharball").new())
 do return end
 			local f, err = loadfile("/data/general/events/crystaline-forest.lua")
 			print(f, err)
 			setfenv(f, setmetatable({level=self.level, zone=self.zone}, {__index=_G}))
 			print(pcall(f))
 do return end
-			self:registerDialog(require("mod.dialogs.DownloadCharball").new())
 		end end,
 		[{"_f","ctrl"}] = function() if config.settings.cheat then
 			self.player.quests["love-melinda"] = nil

game/modules/tome/data/quests/shertul-fortress.lua

@@ -196,13 +196,11 @@ fly = function(self)
 
 		local f = require("mod.class.FortressPC").new{}
 		game:changeLevel(1, "wilderness", {direct_switch=true})
-		game.party:addMember(f, {temporary_level=1, control="full"})
 		f.x = game.player.x
 		f.y = game.player.y
-		game.party:setPlayer(f, true)
 		game.level:addEntity(f)
-		game.level.map:remove(f.x, f.y, engine.Map.ACTOR)
 		f:move(f.x, f.y, true)
+		f:takeControl(game.player)
 
 		game.player:setQuestStatus("shertul-fortress", self.COMPLETED, "flying")
 	end