diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-14 15:58:56 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-14 15:58:56 +0000 |
| commit | 5641ccc808364567491d50c677ad17a28f58757d (patch) | |
| tree | 1ec5ad42e944cf3236efaa9873a137f5b4c13854 /src/map/clif.c | |
| parent | be4a58c26a3109c6f9ec08e4604cbd30d31ad39e (diff) | |
| download | hercules-5641ccc808364567491d50c677ad17a28f58757d.tar.gz hercules-5641ccc808364567491d50c677ad17a28f58757d.tar.bz2 hercules-5641ccc808364567491d50c677ad17a28f58757d.tar.xz hercules-5641ccc808364567491d50c677ad17a28f58757d.zip | |
- Fixed being able to do all the stuff you shouldn't be able to during the petrifying state.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6059 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index bbb42a873..b7e856d57 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -161,7 +161,7 @@ enum { //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->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->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->vender_id || sd->trade_partner)
@@ -8154,7 +8154,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd) { return;
}
- if (clif_cant_act(sd))
+ if (clif_cant_act(sd) && sd->sc.opt1 != OPT1_STONEWAIT)
return;
if (!unit_can_move(&sd->bl))
|