diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-20 16:04:47 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-20 16:04:47 +0000 |
| commit | b5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c (patch) | |
| tree | 455e9289ccd1981acdd35e459b099a1e79a3552d /src/map/clif.c | |
| parent | ee340265a907f243c01588d86b47f244acf7e268 (diff) | |
| download | hercules-b5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c.tar.gz hercules-b5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c.tar.bz2 hercules-b5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c.tar.xz hercules-b5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c.zip | |
- Added support for n to specify minutes to @charban.
- Fixed a logic typo on the way dummy_npc_id was defined.
- Added state.trading to specify when a trading has started. Now you should be able to walk around until the trade is either rejected or started.
- Armor defense is no longer reduced by the amount of characters targetting you.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6192 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 484abb02a..3aba4a0a1 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -161,10 +161,10 @@ 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->trade_partner || sd->state.storage_flag)
+#define clif_cant_act(sd) (sd->npc_id || sd->vender_id || sd->chatID || sd->sc.opt1 || sd->state.trading || 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)
+#define clif_trading(sd) (sd->npc_id || sd->vender_id || sd->state.trading )
//To idenfity disguised characters.
#define disguised(bl) (bl->type==BL_PC && ((TBL_PC*)bl)->disguise)
|