X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=main.h;h=0731781ba68cf00b30ce7228ee26750e14102375;hb=795115bf680185ae01043bd1222b78bfed8c1d87;hp=bf72d283d5dd345a76771d234ba4045f5ec60a5e;hpb=296b958ce326f1fd8f59c6a76e48348364e19a6c;p=NeonServV5.git

diff --git a/main.h b/main.h
index bf72d28..0731781 100644
--- a/main.h
+++ b/main.h
@@ -1,7 +1,12 @@
 #ifndef _main_h
 #define _main_h
 
+#define NEONSERV_VERSION "5.0.1-dev"
+
 #include "config.h"
+#ifndef BOTWAR_ALERT_CHAN
+#define BOTWAR_ALERT_CHAN NULL
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,6 +36,21 @@
 #define UNUSED_ARG(ARG) ARG
 #endif
 
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+ 
+#if defined(__GNUC__)
+#if defined(__GNUC_PATCHLEVEL__)
+#define COMPILER "GCC" " " STRINGIFY(__GNUC__) "." STRINGIFY(__GNUC_MINOR__) "." STRINGIFY(__GNUC_PATCHLEVEL__)
+#else
+#define COMPILER "GCC" " " STRINGIFY(__GNUC__) "." STRINGIFY(__GNUC_MINOR__)
+#endif
+#elif defined (__IMAGECRAFT__)
+#define COMPILER "ICCAVR"
+#else
+#define COMPILER "Unknown"
+#endif
+
 #define SOCKET_SELECT_TIME 2
 
 #define NICKLEN         30
@@ -45,9 +65,12 @@
 #define MAXNUMPARAMS    200 /* maximum number of parameters in one line */
 #define MAXLANGUAGES    5
 #define MAXMODES        6
+#define INVITE_TIMEOUT  30
+#define BOTWAR_DETECTION_TIME 7
+#define BOTWAR_DETECTION_EVENTS 6
 
 //valid nick chars
-#define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^_`"
+#define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^-_`"
 //the first char is a little bit different
 //                              0        1         2         3         4         5          6
 //                              1234567890123456789012345678901234567890123456789012345678 9012   62