summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-02-01 23:06:45 -0200
committershennetsind <ind@henn.et>2013-02-01 23:06:45 -0200
commit17f2e6a581ef9e37f01cfd1b98c335a6d5b5ac75 (patch)
tree77e940cbff82ce3def439b279f91f96161f5e102 /src/map
parent63145d6d4079b692a3cd36eb340b9a0e71b9fbaa (diff)
downloadhercules-17f2e6a581ef9e37f01cfd1b98c335a6d5b5ac75.tar.gz
hercules-17f2e6a581ef9e37f01cfd1b98c335a6d5b5ac75.tar.bz2
hercules-17f2e6a581ef9e37f01cfd1b98c335a6d5b5ac75.tar.xz
hercules-17f2e6a581ef9e37f01cfd1b98c335a6d5b5ac75.zip
Fixed clif.c::clif_parse_NpcSelectMenu
SECURE_NPCTIMEOUT is always defined; the check is wrong. Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index f8b5119eb..3443c1ae3 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11112,13 +11112,13 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd)
uint8 select = RFIFOB(fd,6);
if( (select > sd->npc_menu && select != 0xff) || select == 0 ) {
-#ifdef SECURE_NPCTIMEOUT
+#if SECURE_NPCTIMEOUT
if( sd->npc_idle_timer != INVALID_TIMER ) {
#endif
TBL_NPC* nd = map_id2nd(npc_id);
ShowWarning("Invalid menu selection on npc %d:'%s' - got %d, valid range is [%d..%d] (player AID:%d, CID:%d, name:'%s')!\n", npc_id, (nd)?nd->name:"invalid npc id", select, 1, sd->npc_menu, sd->bl.id, sd->status.char_id, sd->status.name);
clif_GM_kick(NULL,sd);
-#ifdef SECURE_NPCTIMEOUT
+#if SECURE_NPCTIMEOUT
}
#endif
return;