fix doors

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

game/modules/tome/class/Grid.lua

@@ -38,7 +38,9 @@ function _M:block_move(x, y, e, act, couldpass)
 	if self.door_opened and e.open_door and act then
 		game.level.map(x, y, engine.Map.TERRAIN, game.zone.grid_list[self.door_opened])
 		return true
-	elseif self.door_opened and e.open_door and not couldpass then
+	elseif self.door_opened and not couldpass then
+		return true
+	elseif self.door_opened and couldpass and not e.open_door then
 		return true
 	end
 

game/modules/tome/data/maps/quests/lost-merchant.lua

@@ -75,7 +75,7 @@ defineTile('@', "FLOOR", nil, mod.class.NPC.new{
 	is_merchant = true,
 })
 
-startx = 1
+startx = 2
 starty = 9
 
 return [[