Moved cl_available definition to vid_shared.c

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index 518ad5b9594d198fcc95bf6556347b506210d7fb..95043325e40be71f476bcb99c8220018dee5c347 100644 (file)
--- a/common.c
+++ b/common.c
@@ -425,17 +425,9 @@ void SZ_Write (sizebuf_t *buf, const void *data, int length)
        memcpy (SZ_GetSpace(buf,length),data,length);
 }
 
-void SZ_Print (sizebuf_t *buf, const char *data)
-{
-       int len;
-       len = strlen(data)+1;
-
-// byte * cast to keep VC++ happy
-       if (buf->data[buf->cursize-1])
-               memcpy ((qbyte *)SZ_GetSpace(buf, len),data,len); // no trailing 0
-       else
-               memcpy ((qbyte *)SZ_GetSpace(buf, len-1)-1,data,len); // write over trailing 0
-}
+// LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
+// attention, it has been eradicated from here, its only (former) use in
+// all of darkplaces.
 
 static char *hexchar = "0123456789ABCDEF";
 void Com_HexDumpToConsole(const qbyte *data, int size)
@@ -776,6 +768,8 @@ void COM_InitGameType (void)
                gamemode = GAME_FNIGGIUM;
        else if (strstr(name, "setheral"))
                gamemode = GAME_SETHERAL;
+       else if (strstr(name, "som"))
+               gamemode = GAME_SOM;
        else
                gamemode = GAME_NORMAL;
 
@@ -803,6 +797,8 @@ void COM_InitGameType (void)
                gamemode = GAME_FNIGGIUM;
        else if (COM_CheckParm ("-setheral"))
                gamemode = GAME_SETHERAL;
+       else if (COM_CheckParm ("-som"))
+               gamemode = GAME_SOM;
 
        switch(gamemode)
        {
@@ -854,6 +850,10 @@ void COM_InitGameType (void)
                gamename = "Setheral";
                gamedirname = "data";
                break;
+       case GAME_SOM:
+               gamename = "Son of Man";
+               gamedirname = "data";
+               break;
        default:
                Sys_Error("COM_InitGameType: unknown gamemode %i\n", gamemode);
                break;
@@ -1121,7 +1121,7 @@ char *SearchInfostring(const char *infostring, const char *key)
 
 
 // Most (all?) BSDs already have them
-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !(defined(__APPLE__) && defined(__MACH__))
 
 size_t
 strlcat(char *dst, const char *src, size_t siz)