Fixed sustains staying on when unlearning them in some corner cases

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

game/engines/default/engine/interface/PlayerRest.lua

@@ -104,7 +104,6 @@ function _M:restStop(msg)
 	end
 
 	local finish = self.resting.cnt and self.resting.rest_turns and self.resting.cnt > self.resting.rest_turns
-	game.log("========== %d %d", self.resting.cnt or -1, self.resting.rest_turns or -1)
 	local on_very_end = self.resting.on_very_end
 	if self.resting.on_end then self.resting.on_end(self.resting.cnt, self.resting.rest_turns) end
 	self:onRestStop()

game/modules/tome/class/Game.lua

@@ -1242,12 +1242,6 @@ function _M:setupCommands()
 			end end
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
-			local f, err = loadfile("/data/general/events/whistling-vortex.lua")
-			print(f, err)
-			setfenv(f, setmetatable({level=self.level, zone=self.zone}, {__index=_G}))
-			print(pcall(f))
-			self:registerDialog(require("mod.dialogs.DownloadCharball").new())
-do return end
 			package.loaded["mod.dialogs.elements.TalentGrid"] = nil
 			package.loaded["mod.dialogs.UberTalent"] = nil
 			local list = {}

game/modules/tome/dialogs/LevelupDialog.lua

@@ -101,8 +101,12 @@ function _M:init(actor, on_finish, on_birth)
 	}
 	self.key:addBinds{
 		EXIT = function()
+			local changed = #self.actor.last_learnt_talents.class ~= #self.actor_dup.last_learnt_talents.class or #self.actor.last_learnt_talents.generic ~= #self.actor_dup.last_learnt_talents.generic
+			for i = 1, #self.actor.last_learnt_talents.class do if self.actor.last_learnt_talents.class[i] ~= self.actor_dup.last_learnt_talents.class[i] then changed = true end end
+			for i = 1, #self.actor.last_learnt_talents.generic do if self.actor.last_learnt_talents.generic[i] ~= self.actor_dup.last_learnt_talents.generic[i] then changed = true end end
+
 			if self.actor.unused_stats~=self.actor_dup.unused_stats or self.actor.unused_talents_types~=self.actor_dup.unused_talents_types or
-			self.actor.unused_talents~=self.actor_dup.unused_talents or self.actor.unused_generics~=self.actor_dup.unused_generics or self.actor.unused_prodigies~=self.actor_dup.unused_prodigies then
+			self.actor.unused_talents~=self.actor_dup.unused_talents or self.actor.unused_generics~=self.actor_dup.unused_generics or self.actor.unused_prodigies~=self.actor_dup.unused_prodigies or changed then
 				self:yesnocancelPopup("Finish","Do you accept changes?", function(yes, cancel)
 				if cancel then
 					return nil