- 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, 3 insertions, 2 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 310fe3f9c..636dc37f8 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -157,11 +157,12 @@ enum {
 //To make the assignation of the level based on limits clearer/easier. [Skotlex]

 #define clif_setlevel(lv) (lv<battle_config.max_lv?lv:battle_config.max_lv-(lv<battle_config.aura_lv?1:0));

 

+//Removed sd->npc_shopid because there is no packet sent from the client when you cancel a buy!

 //Quick check to know if the player shouldn't be "busy" with something else to deny action requests. [Skotlex]

-#define clif_cant_act(sd) (sd->npc_id || sd->npc_shopid || sd->vender_id || sd->chatID || (sd->sc.opt1 && sd->sc.opt1 != OPT1_STONEWAIT) || sd->trade_partner || sd->state.storage_flag)

+#define clif_cant_act(sd) (sd->npc_id || sd->vender_id || sd->chatID || (sd->sc.opt1 && sd->sc.opt1 != OPT1_STONEWAIT) || sd->trade_partner || sd->state.storage_flag)

 

 // Checks if SD is in a trade/shop (where messing with the inventory can cause problems/exploits)

-#define clif_trading(sd) (sd->npc_id || sd->npc_shopid || sd->vender_id || sd->trade_partner)

+#define clif_trading(sd) (sd->npc_id || sd->vender_id || sd->trade_partner)

 

 static char map_ip_str[16];

 static in_addr_t map_ip;