increased M_MAX_EDICTS to 32768

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 1cfcfd44dad56db83e15c9306acc4042644a6816..816a8fa96be90f3e20818222d94762a9ffc394c8 100644 (file)
--- a/common.h
+++ b/common.h
@@ -84,8 +84,9 @@ void Com_BlockFullChecksum (void *buffer, int len, unsigned char *outbuf);
 #endif
 
 // If we still don't know the CPU endianess at this point, we try to guess
+// normally including sys/types.h includes endian.h for the platform, which defines BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN, however endian.h is a BSD-ism, and may not be present on all platforms (particularly windows)
 #ifndef BYTE_ORDER
-# if defined(WIN32)
+# if defined(WIN32) || defined (__i386) || defined(__amd64)
 #  define BYTE_ORDER LITTLE_ENDIAN
 # else
 #  if defined(SUNOS)
@@ -210,10 +211,9 @@ 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, ...);
+char   *va(const char *format, ...) DP_FUNC_PRINTF(1);
 // does a varargs printf into a temp buffer
 
 
@@ -225,14 +225,20 @@ char      *va(const char *format, ...);
 // return the number of printed characters, excluding the final '\0'
 // or return -1 if the buffer isn't big enough to contain the entire string.
 // buffer is ALWAYS null-terminated
-extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...);
+extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...) DP_FUNC_PRINTF(3);
 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
 
 
@@ -262,6 +268,8 @@ typedef enum gamemode_e
        GAME_NETHERWORLD,
        GAME_THEHUNTED,
        GAME_DEFEATINDETAIL2,
+       GAME_DARSANA,
+       GAME_CONTAGIONTHEORY,
 }
 gamemode_t;