GL_Color no longer interacts with GL_ColorPointer (so be sure to set GL_ColorPointer...

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index a10242a6e7097382be8489d96c96c7849c24cf8c..5c030caf59d6758c0e541a46e754d46d087646ce 100644 (file)
--- a/common.h
+++ b/common.h
@@ -47,7 +47,7 @@ void SZ_Free (sizebuf_t *buf);
 void SZ_Clear (sizebuf_t *buf);
 void *SZ_GetSpace (sizebuf_t *buf, int length);
 void SZ_Write (sizebuf_t *buf, const void *data, int length);
-void SZ_Print (sizebuf_t *buf, const char *data);      // strcats onto the sizebuf
+void SZ_Print(sizebuf_t *buf, const char *data);       // strcats onto the sizebuf
 void SZ_HexDumpToConsole(const sizebuf_t *buf);
 
 void Com_HexDumpToConsole(const qbyte *data, int size);
@@ -73,7 +73,7 @@ float FloatSwap (float f);
 #define LittleLong(l) (l)
 #define BigFloat(l) FloatSwap(l)
 #define LittleFloat(l) (l)
-#elif ENDIAN_BIG
+#elif defined(ENDIAN_BIG)
 // big endian
 #define BigShort(l) (l)
 #define LittleShort(l) ShortSwap(l)
@@ -131,18 +131,17 @@ int MSG_ReadBytes (int numbytes, unsigned char *out);
 
 float MSG_ReadCoord (void);
 
-float MSG_ReadDPCoord (void);
-
 #define MSG_ReadAngle() (MSG_ReadByte() * (360.0f / 256.0f))
 #define MSG_ReadPreciseAngle() (MSG_ReadShort() * (360.0f / 65536.0f))
 
-#define MSG_ReadVector(v) {(v)[0] = MSG_ReadCoord();(v)[1] = MSG_ReadCoord();(v)[2] = MSG_ReadCoord();}
+#define MSG_ReadVector(v) ((v)[0] = MSG_ReadCoord(), (v)[1] = MSG_ReadCoord(), (v)[2] = MSG_ReadCoord())
 
 //============================================================================
 
 extern char com_token[1024];
 
 int COM_ParseToken(const char **datapointer, int returnnewline);
+int COM_ParseTokenConsole(const char **datapointer);
 
 extern int com_argc;
 extern const char **com_argv;
@@ -159,6 +158,7 @@ char        *va(const char *format, ...);
 //============================================================================
 
 extern struct cvar_s   registered;
+extern struct cvar_s   cmdline;
 
 #define GAME_NORMAL 0
 #define GAME_HIPNOTIC 1
@@ -170,6 +170,10 @@ extern     struct cvar_s   registered;
 #define GAME_TEU 7
 #define GAME_BATTLEMECH 8
 #define GAME_ZYMOTIC 9
+#define GAME_FNIGGIUM 10
+#define GAME_SETHERAL 11
+#define GAME_SOM 12
+#define GAME_TENEBRAE 13 // full of evil hackery
 
 extern int gamemode;
 extern char *gamename;
@@ -180,7 +184,7 @@ void COM_ToLowerString (const char *in, char *out, size_t size_out);
 void COM_ToUpperString (const char *in, char *out, size_t size_out);
 int COM_StringBeginsWith(const char *s, const char *match);
 
-int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize);
+int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix);
 
 typedef struct stringlist_s
 {
@@ -189,6 +193,9 @@ typedef struct stringlist_s
 } stringlist_t;
 
 int matchpattern(char *in, char *pattern, int caseinsensitive);
+stringlist_t *stringlistappend(stringlist_t *current, char *text);
+void stringlistfree(stringlist_t *current);
+stringlist_t *stringlistsort(stringlist_t *start);
 stringlist_t *listdirectory(char *path);
 void freedirectory(stringlist_t *list);
 
@@ -197,8 +204,12 @@ char *SearchInfostring(const char *infostring, const char *key);
 
 // strlcat and strlcpy, from OpenBSD
 // Most (all?) BSDs already have them
-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__))
+# define HAVE_STRLCAT 1
+# define HAVE_STRLCPY 1
+#endif
 
+#ifndef HAVE_STRLCAT
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the
  * full size of dst, not space left).  At most siz-1 characters
@@ -207,7 +218,9 @@ char *SearchInfostring(const char *infostring, const char *key);
  * If retval >= siz, truncation occurred.
  */
 size_t strlcat(char *dst, const char *src, size_t siz);
+#endif  // #ifndef HAVE_STRLCAT
 
+#ifndef HAVE_STRLCPY
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
  * will be copied.  Always NUL terminates (unless siz == 0).
@@ -215,7 +228,7 @@ size_t strlcat(char *dst, const char *src, size_t siz);
  */
 size_t strlcpy(char *dst, const char *src, size_t siz);
 
-#endif  // #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+#endif  // #ifndef HAVE_STRLCPY
 
 #endif