X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=common.h;h=3f6c0ddebe2825dcc9efe3856ca4521e75d1bf1b;hb=f7e37f88d839aaf88b304e2cfc000bf10ca9ed83;hp=cceb571af3ff090c3b1c66a3a357bc165da5c286;hpb=11e05215e5f3cee630f54b9836dab1b36b5b4ffc;p=xonotic%2Fdarkplaces.git

diff --git a/common.h b/common.h
index cceb571a..3f6c0dde 100644
--- a/common.h
+++ b/common.h
@@ -33,11 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # define MACOSX
 #endif
 
-// Create our own define for Solaris
-#if defined(__sun__) && defined(__svr4__)
-# define SUNOS
-#endif
-
 #ifdef SUNOS
 #include <sys/file.h>		// Needed for FNDELAY
 # define model_t dp_model_t // Workaround conflict with /usr/include/sys/model.h
@@ -49,20 +44,19 @@ typedef struct sizebuf_s
 {
 	qboolean	allowoverflow;	// if false, do a Sys_Error
 	qboolean	overflowed;		// set to true if the buffer size failed
-	qbyte		*data;
+	unsigned char		*data;
 	int			maxsize;
 	int			cursize;
 } sizebuf_t;
 
 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
+unsigned char *SZ_GetSpace (sizebuf_t *buf, int length);
+void SZ_Write (sizebuf_t *buf, const unsigned char *data, int length);
 void SZ_HexDumpToConsole(const sizebuf_t *buf);
 
-void Com_HexDumpToConsole(const qbyte *data, int size);
+void Com_HexDumpToConsole(const unsigned char *data, int size);
 
-unsigned short CRC_Block(const qbyte *data, size_t size);
+unsigned short CRC_Block(const unsigned char *data, size_t size);
 
 
 //============================================================================
@@ -121,10 +115,10 @@ float FloatSwap (float f);
 #define LittleFloat(l) FloatSwap(l)
 #endif
 
-unsigned int BuffBigLong (const qbyte *buffer);
-unsigned short BuffBigShort (const qbyte *buffer);
-unsigned int BuffLittleLong (const qbyte *buffer);
-unsigned short BuffLittleShort (const qbyte *buffer);
+unsigned int BuffBigLong (const unsigned char *buffer);
+unsigned short BuffBigShort (const unsigned char *buffer);
+unsigned int BuffLittleLong (const unsigned char *buffer);
+unsigned short BuffLittleShort (const unsigned char *buffer);
 
 
 //============================================================================
@@ -153,6 +147,7 @@ void MSG_WriteShort (sizebuf_t *sb, int c);
 void MSG_WriteLong (sizebuf_t *sb, int c);
 void MSG_WriteFloat (sizebuf_t *sb, float f);
 void MSG_WriteString (sizebuf_t *sb, const char *s);
+void MSG_WriteUnterminatedString (sizebuf_t *sb, const char *s);
 void MSG_WriteAngle8i (sizebuf_t *sb, float f);
 void MSG_WriteAngle16i (sizebuf_t *sb, float f);
 void MSG_WriteAngle32f (sizebuf_t *sb, float f);
@@ -250,6 +245,7 @@ typedef enum gamemode_e
 	GAME_PRYDON,
 	GAME_NETHERWORLD,
 	GAME_THEHUNTED,
+	GAME_DEFEATINDETAIL2,
 }
 gamemode_t;