diff options
author | shenhuyong <shenhuyong@hotmail.com> | 2013-10-08 01:54:20 +0800 |
---|---|---|
committer | shenhuyong <shenhuyong@hotmail.com> | 2013-10-08 01:54:20 +0800 |
commit | 33622377e840c6d15ee7f65a1e4b9b9a815bd69b (patch) | |
tree | 6984312a8856cc67d5032a533eb6ad70cae19e9d /src/map/npc.h | |
parent | 0a14a122a02aeac9b8cf007eb727cdab846f2329 (diff) | |
parent | 07cbb72a3e89ba0fe1fb4b3bed1cac6568259999 (diff) | |
download | hercules-33622377e840c6d15ee7f65a1e4b9b9a815bd69b.tar.gz hercules-33622377e840c6d15ee7f65a1e4b9b9a815bd69b.tar.bz2 hercules-33622377e840c6d15ee7f65a1e4b9b9a815bd69b.tar.xz hercules-33622377e840c6d15ee7f65a1e4b9b9a815bd69b.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/npc.h')
-rw-r--r-- | src/map/npc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index 3c273fffb..f809cb19c 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -229,9 +229,7 @@ struct npc_interface { /** * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ -#ifdef SECURE_NPCTIMEOUT int (*secure_timeout_timer) (int tid, unsigned int tick, int id, intptr_t data); -#endif }; struct npc_interface *npc; |