summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2009-11-08 06:25:42 -0500
committerMadCamel <madcamel@gmail.com>2009-11-08 06:25:42 -0500
commit6e42644247e80667db4d39c3a0e543d9476f9c87 (patch)
tree483cd44a8e4bd1587b3c1c51e8bad5f9d30da7c8 /src/map/map.h
parent35044714f13629ee6951aaa7a03d409428fdd4e4 (diff)
parentd90bbe7517fd3bd51d4893cced5f20bcf314e601 (diff)
downloadtmwa-6e42644247e80667db4d39c3a0e543d9476f9c87.tar.gz
tmwa-6e42644247e80667db4d39c3a0e543d9476f9c87.tar.bz2
tmwa-6e42644247e80667db4d39c3a0e543d9476f9c87.tar.xz
tmwa-6e42644247e80667db4d39c3a0e543d9476f9c87.zip
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map/map.h')
-rw-r--r--src/map/map.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/map.h b/src/map/map.h
index 9a6b3ef..c0a9772 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -358,6 +358,10 @@ struct map_session_data {
int ignoreAll;
short sg_count;
+ struct {
+ unsigned in_progress : 1;
+ } auto_ban_info;
+
time_t chat_reset_due;
time_t chat_repeat_reset_due;
int chat_lines_in;