summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-20 16:04:47 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-20 16:04:47 +0000
commitb5b4c77e5fff30072c7c24ed8a8d7316d08d8c9c (patch)
tree455e9289ccd1981acdd35e459b099a1e79a3552d /src/map/map.h
parentee340265a907f243c01588d86b47f244acf7e268 (diff)
downloadhercules-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/map.h')
-rw-r--r--src/map/map.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/map.h b/src/map/map.h
index 4a558f9cb..1c6c8214b 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -486,7 +486,8 @@ struct map_session_data {
unsigned showexp :1;
unsigned showzeny :1;
unsigned mainchat :1; //[LuzZza]
- unsigned deal_locked :2;
+ unsigned trading :1; //[Skotlex] is 1 only after a trade has started.
+ unsigned deal_locked :2; //1: Clicked on OK. 2: Clicked on TRADE
unsigned party_sent :1;
unsigned guild_sent :1;
unsigned monster_ignore :1; // for monsters to ignore a character [Valaris] [zzo]