Fixed the jewelry creation

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

game/engines/default/engine/dialogs/ShowInventory.lua

@@ -71,11 +71,12 @@ function _M:select(item)
 	end
 end
 function _M:use(item)
+	local dont_end = false
 	if item and item.object then
-		self.action(item.object, item.item)
+		dont_end = self.action(item.object, item.item)
 	end
 	self:generateList()
-	--game:unregisterDialog(self)
+	if not dont_end then game:unregisterDialog(self) end
 end
 
 function _M:generateList()

game/modules/tome/class/Player.lua

@@ -728,6 +728,7 @@ function _M:playerDrop()
 	local d d = self:showInventory(titleupdator(), inven, nil, function(o, item)
 		self:doDrop(inven, item)
 		d:updateTitle(titleupdator())
+		return true
 	end)
 end
 
@@ -739,6 +740,7 @@ function _M:playerWear()
 	end, function(o, item)
 		self:doWear(inven, item, o)
 		d:updateTitle(titleupdator())
+		return true
 	end)
 end
 
@@ -747,6 +749,7 @@ function _M:playerTakeoff()
 	local d d = self:showEquipment(titleupdator(), nil, function(o, inven, item)
 		self:doTakeoff(inven, item, o)
 		d:updateTitle(titleupdator())
+		return true
 	end)
 end
 

game/modules/tome/data/zones/crypt-kryl-feijan/zone.lua

@@ -104,7 +104,8 @@ return {
 			return nil, nil, true
 		end
 
-		if melinda and not melinda.dead and not game.player:isQuestStatus("kryl-feijan-escape", engine.Quest.FAILED) then
+		local g = game.level.map(game.player.x, game.player.y, engine.Map.TERRAIN)
+		if melinda and not melinda.dead and not game.player:isQuestStatus("kryl-feijan-escape", engine.Quest.FAILED) and g and g.change_level then
 			game.player:setQuestStatus("kryl-feijan-escape", engine.Quest.DONE)
 			world:gainAchievement("MELINDA_SAVED", game.player)
 		end