- Fixed the CL_WHITE define, thanks to FlavioJS

- NPC break equipment stuff now has a 1.5% per skilllv success rate.
- pc_setpos won't random warp players if placed on top of Moonlight Petals
- Removed the check in clif.c for npc_shopid as the client never sends a packet when the trade is cancelled...


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5384 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 5 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index 37834ab10..257000c70 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3238,13 +3238,13 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
 	if(x <0 || x >= map[m].xs || y <0 || y >= map[m].ys)

 		x=y=0;

 	if((x==0 && y==0) ||

+		(map_getcell(m, x, y, CELL_CHKNOPASS) &&

+		!map_getcell(m, x, y, CELL_CHKICEWALL) &&

 #ifndef CELL_NOSTACK

-		(map_getcell(m,x,y,CELL_CHKNOPASS) && !map_getcell(m, x, y, CELL_CHKICEWALL))

-#else

-		(map_getcell(m,x,y,CELL_CHKNOPASS) && !map_getcell(m, x, y, CELL_CHKICEWALL) && !map_getcell(m, x, y, CELL_CHKSTACK))

+		!map_getcell(m, x, y, CELL_CHKSTACK) &&

 #endif

-	){ //We allow placing players on top of an ICEWALL tile to prevent force-warping players when an ice wall is placed 

-		//at spawn points from warps and the like. [Skotlex]

+		!map_getcell(m, x, y, CELL_CHKMOONLIT))

+	){ //It is allowed on top of Moonlight/icewall tiles to prevent force-warping 'cheats' [Skotlex]

 		if(x||y) {

 			if(battle_config.error_log)

 				ShowError("pc_setpos: attempt to place player on non-walkable tile (%s-%d,%d)\n",mapindex_id2name(mapindex),x,y);