reorganized Host_Init a bit, merged away a few functions (such as COM_CheckRegistered...

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index e452e2e0f4496eab08cb795fc1d42d4ba977a68b..0cb18bfb59c901b32bc56b8db8ac25f37203301a 100644 (file)
--- a/common.h
+++ b/common.h
@@ -210,7 +210,6 @@ extern const char **com_argv;
 int COM_CheckParm (const char *parm);
 void COM_Init (void);
 void COM_Shutdown (void);
-void COM_InitArgv (void);
 void COM_InitGameType (void);
 
 char   *va(const char *format, ...);
@@ -228,6 +227,19 @@ char       *va(const char *format, ...);
 extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...);
 extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args);
 
+// A bunch of functions are forbidden for security reasons (and also to please MSVS 2005, for some of them)
+// LordHavoc: added #undef lines here to avoid warnings in Linux
+#undef strcat
+#define strcat DO_NOT_USE_STRCAT__USE_STRLCAT_OR_MEMCPY
+#undef strncat
+#define strncat DO_NOT_USE_STRNCAT__USE_STRLCAT_OR_MEMCPY
+#undef strcpy
+#define strcpy DO_NOT_USE_STRCPY__USE_STRLCPY_OR_MEMCPY
+#undef strncpy
+#define strncpy DO_NOT_USE_STRNCPY__USE_STRLCPY_OR_MEMCPY
+//#undef sprintf
+//#define sprintf DO_NOT_USE_SPRINTF__USE_DPSNPRINTF
+
 
 //============================================================================
 
@@ -246,7 +258,6 @@ typedef enum gamemode_e
        GAME_TEU,
        GAME_BATTLEMECH,
        GAME_ZYMOTIC,
-       GAME_FNIGGIUM,
        GAME_SETHERAL,
        GAME_SOM,
        GAME_TENEBRAE, // full of evil hackery
@@ -279,7 +290,7 @@ typedef struct stringlist_s
        char *text;
 } stringlist_t;
 
-int matchpattern(char *in, char *pattern, int caseinsensitive);
+int matchpattern(const char *in, const char *pattern, int caseinsensitive);
 stringlist_t *stringlistappend(stringlist_t *current, char *text);
 void stringlistfree(stringlist_t *current);
 stringlist_t *stringlistsort(stringlist_t *start);