diff options
author | TAW Dev <tawdev@taw> | 2009-07-08 11:04:59 -0400 |
---|---|---|
committer | TAW Dev <tawdev@taw> | 2009-07-08 11:04:59 -0400 |
commit | aa0bb68d762f72d8abb2b71079e98a8e27969412 (patch) | |
tree | 77e38010cc0443cc7480572e823dd13ee7ee555d /src/map/map.h | |
parent | e9c1a79b6306783d63655eca5ddbcca0b6d825d0 (diff) | |
parent | 4673fd3ca06010e74f8223486b0f34e58c7b0a7e (diff) | |
download | tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.tar.gz tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.tar.bz2 tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.tar.xz tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.zip |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map/map.h')
-rw-r--r-- | src/map/map.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/map.h b/src/map/map.h index 7275734..1c49293 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -358,6 +358,9 @@ struct map_session_data { time_t chat_reset_due; int chat_lines_in; char chat_lastmsg[513]; + + time_t trade_reset_due; + int trades_in; }; struct npc_timerevent_list { |