From e671397fb25182e67d191c32f1272a4727322807 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Tue, 16 Apr 2013 00:48:09 -0300 Subject: 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 --- src/config/const.h | 10 ++++++++-- src/config/secure.h | 24 ++++++++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) (limited to 'src/config') diff --git a/src/config/const.h b/src/config/const.h index abc36b05f..825824c62 100644 --- a/src/config/const.h +++ b/src/config/const.h @@ -19,8 +19,14 @@ #if SECURE_NPCTIMEOUT_INTERVAL <= 0 #error SECURE_NPCTIMEOUT_INTERVAL should be at least 1 (1s) #endif -#if SECURE_NPCTIMEOUT < 0 - #error SECURE_NPCTIMEOUT cannot be lower than 0 +#if NPC_SECURE_TIMEOUT_INPUT < 0 + #error NPC_SECURE_TIMEOUT_INPUT cannot be lower than 0 +#endif +#if NPC_SECURE_TIMEOUT_MENU < 0 + #error NPC_SECURE_TIMEOUT_MENU cannot be lower than 0 +#endif +#if NPC_SECURE_TIMEOUT_NEXT < 0 + #error NPC_SECURE_TIMEOUT_NEXT cannot be lower than 0 #endif /** diff --git a/src/config/secure.h b/src/config/secure.h index 70ee0437a..7f16ba55a 100644 --- a/src/config/secure.h +++ b/src/config/secure.h @@ -17,11 +17,27 @@ * Optional NPC Dialog Timer * When enabled all npcs dialog will 'timeout' if user is on idle for longer than the amount of seconds allowed * - On 'timeout' the npc dialog window changes its next/menu to a 'close' button - * @values - * - ? : Desired idle time in seconds (e.g. 10) - * - 0 : Disabled + * Uncomment to enable **/ -#define SECURE_NPCTIMEOUT 0 +//#define SECURE_NPCTIMEOUT + +/** + * number of seconds to 'timeout' if the user is on idle for longer than the value allowed after a 'input' field is displayed. + * default: 180 + **/ +#define NPC_SECURE_TIMEOUT_INPUT 180 + +/** + * number of seconds to 'timeout' if the user is on idle for longer than the value allowed after a 'menu' is displayed. + * default: 60 + **/ +#define NPC_SECURE_TIMEOUT_MENU 60 + +/** + * number of seconds to 'timeout' if the user is on idle for longer than the value allowed after a 'next' button is displayed. + * default: 60 + **/ +#define NPC_SECURE_TIMEOUT_NEXT 60 /** * (Secure) Optional NPC Dialog Timer -- cgit v1.2.3-60-g2f50