diff options
| author | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
|---|---|---|
| committer | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
| commit | 8c3c4577bde31ccee677ea75649b89cfa5822240 (patch) | |
| tree | 6f1c3cf85deea0932b974d5a8943184966bff46a /src/config/const.h | |
| parent | 3a6517e14649805db47b332934f4cad972d00e95 (diff) | |
| parent | 038174e232c03519474f86e5738cecac34bbdee3 (diff) | |
| download | hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.gz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.bz2 hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.xz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Diffstat (limited to 'src/config/const.h')
| -rw-r--r-- | src/config/const.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/config/const.h b/src/config/const.h index abc36b05f..53f24da6f 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 /** @@ -47,9 +53,9 @@ /* pointer size fix which fixes several gcc warnings */ #ifdef __64BIT__ - #define __64BPRTSIZE(y) (intptr)y + #define __64BPTRSIZE(y) (intptr)y #else - #define __64BPRTSIZE(y) y + #define __64BPTRSIZE(y) y #endif /* ATCMD_FUNC(mobinfo) HIT and FLEE calculations */ |