summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-04-16 00:48:09 -0300
committershennetsind <ind@henn.et>2013-04-16 00:48:09 -0300
commite671397fb25182e67d191c32f1272a4727322807 (patch)
tree529f1b3eec363998a7f649564fd33112391f8c47 /src/map/clif.c
parentf3e20da4be387c0e49da58a8be676c9878818ebb (diff)
downloadhercules-e671397fb25182e67d191c32f1272a4727322807.tar.gz
hercules-e671397fb25182e67d191c32f1272a4727322807.tar.bz2
hercules-e671397fb25182e67d191c32f1272a4727322807.tar.xz
hercules-e671397fb25182e67d191c32f1272a4727322807.zip
Fixed Bug #1721
SECURE_NPCTIMEOUT now possesses 3 settings (to mimic official ones) NPC_SECURE_TIMEOUT_INPUT NPC_SECURE_TIMEOUT_MENU NPC_SECURE_TIMEOUT_NEXT http://hercules.ws/board/tracker/issue-1721-npc-window-timeout/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/clif.c')
-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 57b14b1de..d851b4435 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11255,13 +11255,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 ) {
-#if SECURE_NPCTIMEOUT
+#ifdef 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);
-#if SECURE_NPCTIMEOUT
+#ifdef SECURE_NPCTIMEOUT
}
#endif
return;