Moved the $cvar parser to Cmd_TokenizeString.

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index 0c8dc3fc34aa51ce16a9c411cf0d4bcbf3556df5..584cfd790b577c0b5b6f4cab23a8056d11ac8d8c 100644 (file)
--- a/common.c
+++ b/common.c
@@ -171,7 +171,7 @@ static unsigned short crctable[256] =
        0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
 };
 
-unsigned short CRC_Block(const qbyte *data, int size)
+unsigned short CRC_Block(const qbyte *data, size_t size)
 {
        unsigned short crc = CRC_INIT_VALUE;
        while (size--)
@@ -249,7 +249,7 @@ void MSG_WriteString (sizebuf_t *sb, const char *s)
        if (!s)
                SZ_Write (sb, "", 1);
        else
-               SZ_Write (sb, s, strlen(s)+1);
+               SZ_Write (sb, s, (int)strlen(s)+1);
 }
 
 void MSG_WriteCoord13i (sizebuf_t *sb, float f)
@@ -273,19 +273,19 @@ void MSG_WriteCoord32f (sizebuf_t *sb, float f)
        MSG_WriteFloat (sb, f);
 }
 
-void MSG_WriteCoord (sizebuf_t *sb, float f, int protocol)
+void MSG_WriteCoord (sizebuf_t *sb, float f, protocolversion_t protocol)
 {
-       if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_NEHAHRAMOVIE)
+       if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE)
                MSG_WriteCoord13i (sb, f);
-       else if (protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6)
+       else if (protocol == PROTOCOL_DARKPLACES1)
                MSG_WriteCoord32f (sb, f);
        else if (protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4)
                MSG_WriteCoord16i (sb, f);
        else
-               Host_Error("MSG_WriteCoord: unknown protocol\n");
+               MSG_WriteCoord32f (sb, f);
 }
 
-void MSG_WriteVector (sizebuf_t *sb, float *v, int protocol)
+void MSG_WriteVector (sizebuf_t *sb, float *v, protocolversion_t protocol)
 {
        MSG_WriteCoord (sb, v[0], protocol);
        MSG_WriteCoord (sb, v[1], protocol);
@@ -314,12 +314,12 @@ void MSG_WriteAngle32f (sizebuf_t *sb, float f)
        MSG_WriteFloat (sb, f);
 }
 
-void MSG_WriteAngle (sizebuf_t *sb, float f, int protocol)
+void MSG_WriteAngle (sizebuf_t *sb, float f, protocolversion_t protocol)
 {
-       if (protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6)
-               MSG_WriteAngle16i (sb, f);
-       else
+       if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE || protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4)
                MSG_WriteAngle8i (sb, f);
+       else
+               MSG_WriteAngle16i (sb, f);
 }
 
 //
@@ -445,19 +445,19 @@ float MSG_ReadCoord32f (void)
        return MSG_ReadLittleFloat();
 }
 
-float MSG_ReadCoord (int protocol)
+float MSG_ReadCoord (protocolversion_t protocol)
 {
-       if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_NEHAHRAMOVIE)
+       if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE)
                return MSG_ReadCoord13i();
-       else if (protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6)
+       else if (protocol == PROTOCOL_DARKPLACES1)
                return MSG_ReadCoord32f();
        else if (protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4)
                return MSG_ReadCoord16i();
-       Host_Error("MSG_ReadCoord: unknown protocol\n");
-       return 0;
+       else
+               return MSG_ReadCoord32f();
 }
 
-void MSG_ReadVector (float *v, int protocol)
+void MSG_ReadVector (float *v, protocolversion_t protocol)
 {
        v[0] = MSG_ReadCoord(protocol);
        v[1] = MSG_ReadCoord(protocol);
@@ -480,12 +480,12 @@ float MSG_ReadAngle32f (void)
        return MSG_ReadFloat ();
 }
 
-float MSG_ReadAngle (int protocol)
+float MSG_ReadAngle (protocolversion_t protocol)
 {
-       if (protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6)
-               return MSG_ReadAngle16i ();
-       else
+       if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_QUAKEDP || protocol == PROTOCOL_NEHAHRAMOVIE || protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4)
                return MSG_ReadAngle8i ();
+       else
+               return MSG_ReadAngle16i ();
 }
 
 
@@ -783,7 +783,6 @@ skipwhite:
                }
                com_token[len] = 0;
                *datapointer = data+1;
-               return true;
        }
        else
        {
@@ -800,8 +799,9 @@ skipwhite:
                }
                com_token[len] = 0;
                *datapointer = data;
-               return true;
        }
+
+       return true;
 }
 
 
@@ -842,7 +842,7 @@ void COM_CheckRegistered (void)
 {
        Cvar_Set ("cmdline", com_cmdline);
 
-       if (!FS_FileExists("gfx/pop.lmp"))
+       if (gamemode == GAME_NORMAL && !FS_FileExists("gfx/pop.lmp"))
        {
                if (fs_modified)
                        Con_Print("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n");
@@ -1131,7 +1131,7 @@ int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *t
        l = *text;
        commentprefixlength = 0;
        if (commentprefix)
-               commentprefixlength = strlen(commentprefix);
+               commentprefixlength = (int)strlen(commentprefix);
        while (*l && *l != '\n' && *l != '\r')
        {
                if (*l > ' ')