X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=common.h;h=f367ef66f705dae53b8894e93ca31a2e595084d6;hb=9976ca010e51f14b9dfe4c5bc1f945344d3d9bf7;hp=818c54bad24c0d6020a0485271e5fc1c925edeae;hpb=4d4b99bc56915c31fdd88790ac329d125a75a308;p=xonotic%2Fdarkplaces.git

diff --git a/common.h b/common.h
index 818c54ba..f367ef66 100644
--- a/common.h
+++ b/common.h
@@ -47,25 +47,43 @@ 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);
 
+
 //============================================================================
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-#if  defined(__i386__) || defined(__ia64__) || defined(WIN32) || (defined(__alpha__) || defined(__alpha)) || defined(__arm__) || (defined(__mips__) && defined(__MIPSEL__)) || defined(__LITTLE_ENDIAN__)
-#define ENDIAN_LITTLE
-#else
-#define ENDIAN_BIG
+//							Endianess handling
+//============================================================================
+
+// We use BSD-style defines: BYTE_ORDER is defined to either BIG_ENDIAN or LITTLE_ENDIAN
+
+// Initializations
+#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) || !defined(BIG_ENDIAN) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
+# undef BYTE_ORDER
+# undef LITTLE_ENDIAN
+# undef BIG_ENDIAN
+# define LITTLE_ENDIAN 1234
+# define BIG_ENDIAN 4321
 #endif
+
+// If we still don't know the CPU endianess at this point, we try to guess
+#ifndef BYTE_ORDER
+# if defined(WIN32)
+#  define BYTE_ORDER LITTLE_ENDIAN
+# else
+#  warning "Unable to determine the CPU endianess. Defaulting to little endian"
+#  define BYTE_ORDER LITTLE_ENDIAN
+# endif
 #endif
 
+
 short ShortSwap (short l);
 int LongSwap (int l);
 float FloatSwap (float f);
 
-#ifdef ENDIAN_LITTLE
+#if BYTE_ORDER == LITTLE_ENDIAN
 // little endian
 #define BigShort(l) ShortSwap(l)
 #define LittleShort(l) (l)
@@ -73,7 +91,7 @@ float FloatSwap (float f);
 #define LittleLong(l) (l)
 #define BigFloat(l) FloatSwap(l)
 #define LittleFloat(l) (l)
-#elif ENDIAN_BIG
+#else
 // big endian
 #define BigShort(l) (l)
 #define LittleShort(l) ShortSwap(l)
@@ -81,14 +99,6 @@ float FloatSwap (float f);
 #define LittleLong(l) LongSwap(l)
 #define BigFloat(l) (l)
 #define LittleFloat(l) FloatSwap(l)
-#else
-// figure it out at runtime
-extern short (*BigShort) (short l);
-extern short (*LittleShort) (short l);
-extern int (*BigLong) (int l);
-extern int (*LittleLong) (int l);
-extern float (*BigFloat) (float l);
-extern float (*LittleFloat) (float l);
 #endif
 
 unsigned int BuffBigLong (const qbyte *buffer);
@@ -105,10 +115,15 @@ 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_WriteCoord (sizebuf_t *sb, float f);
-void MSG_WriteAngle (sizebuf_t *sb, float f);
-void MSG_WritePreciseAngle (sizebuf_t *sb, float f);
-void MSG_WriteDPCoord (sizebuf_t *sb, float f);
+void MSG_WriteAngle8i (sizebuf_t *sb, float f);
+void MSG_WriteAngle16i (sizebuf_t *sb, float f);
+void MSG_WriteAngle32f (sizebuf_t *sb, float f);
+void MSG_WriteCoord13i (sizebuf_t *sb, float f);
+void MSG_WriteCoord16i (sizebuf_t *sb, float f);
+void MSG_WriteCoord32f (sizebuf_t *sb, float f);
+void MSG_WriteCoord (sizebuf_t *sb, float f, int protocol);
+void MSG_WriteVector (sizebuf_t *sb, float *v, int protocol);
+void MSG_WriteAngle (sizebuf_t *sb, float f, int protocol);
 
 extern	int			msg_readcount;
 extern	qboolean	msg_badread;		// set if a read goes beyond end of message
@@ -129,14 +144,15 @@ int MSG_ReadBytes (int numbytes, unsigned char *out);
 #define MSG_ReadLong MSG_ReadLittleLong
 #define MSG_ReadFloat MSG_ReadLittleFloat
 
-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();}
+float MSG_ReadAngle8i (void);
+float MSG_ReadAngle16i (void);
+float MSG_ReadAngle32f (void);
+float MSG_ReadCoord13i (void);
+float MSG_ReadCoord16i (void);
+float MSG_ReadCoord32f (void);
+float MSG_ReadCoord (int protocol);
+void MSG_ReadVector (float *v, int protocol);
+float MSG_ReadAngle (int protocol);
 
 //============================================================================
 
@@ -160,6 +176,7 @@ char	*va(const char *format, ...);
 //============================================================================
 
 extern	struct cvar_s	registered;
+extern	struct cvar_s	cmdline;
 
 #define GAME_NORMAL 0
 #define GAME_HIPNOTIC 1
@@ -173,10 +190,17 @@ extern	struct cvar_s	registered;
 #define GAME_ZYMOTIC 9
 #define GAME_FNIGGIUM 10
 #define GAME_SETHERAL 11
+#define GAME_SOM 12
+#define GAME_TENEBRAE 13 // full of evil hackery
+#define GAME_NEOTERIC 14
+#define GAME_OPENQUARTZ 15 //this game sucks
+#define GAME_PRYDON 16
+#define GAME_NETHERWORLD 17
 
 extern int gamemode;
-extern char *gamename;
-extern char *gamedirname;
+extern const char *gamename;
+extern const char *gamedirname;
+extern const char *gamescreenshotname;
 extern char com_modname[MAX_OSPATH];
 
 void COM_ToLowerString (const char *in, char *out, size_t size_out);
@@ -203,8 +227,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
@@ -213,7 +241,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).
@@ -221,7 +251,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