get rid of more clang warnings

[xonotic/darkplaces.git] / protocol.c

diff --git a/protocol.c b/protocol.c
index f6975f226eb2b91ca0a6a143c13ff3214e63c33b..0c5984e2de08da030b8952c1ca15db669605c71b 100644 (file)
--- a/protocol.c
+++ b/protocol.c
@@ -112,7 +112,7 @@ int Protocol_NumberForEnum(protocolversion_t p)
        int i;
        for (i = 0;protocolversioninfo[i].name;i++)
                if (protocolversioninfo[i].version == p)
-                       return protocolversioninfo[p].number;
+                       return protocolversioninfo[i].number;
        return 0;
 }
 
@@ -305,14 +305,12 @@ static void EntityFrameCSQC_LostAllFrames(client_t *client)
 void EntityFrameCSQC_LostFrame(client_t *client, int framenum)
 {
        // marks a frame as lost
-       int i, j, n;
+       int i, j;
        qboolean valid;
        int ringfirst, ringlast;
        static int recoversendflags[MAX_EDICTS];
        csqcentityframedb_t *d;
 
-       n = client->csqcnumedicts;
-
        // is our frame out of history?
        ringfirst = client->csqcentityframehistory_next; // oldest entry
        ringlast = (ringfirst + NUM_CSQCENTITYDB_FRAMES - 1) % NUM_CSQCENTITYDB_FRAMES; // most recently added entry
@@ -2036,7 +2034,7 @@ static void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax)
 static int EntityState5_Priority(entityframe5_database_t *d, int stateindex)
 {
        int limit, priority;
-       entity_state_t *s;
+       entity_state_t *s = NULL; // hush compiler warning by initializing this
        // if it is the player, update urgently
        if (stateindex == d->viewentnum)
                return ENTITYFRAME5_PRIORITYLEVELS - 1;
@@ -2868,10 +2866,10 @@ void EntityStateQW_ReadPlayerUpdate(void)
                if (bits & QW_CM_UP)
                        MSG_ReadShort(); // cmd->upmove
                if (bits & QW_CM_BUTTONS)
-                       MSG_ReadByte(); // cmd->buttons
+                       (void) MSG_ReadByte(); // cmd->buttons
                if (bits & QW_CM_IMPULSE)
-                       MSG_ReadByte(); // cmd->impulse
-               MSG_ReadByte(); // cmd->msec
+                       (void) MSG_ReadByte(); // cmd->impulse
+               (void) MSG_ReadByte(); // cmd->msec
        }
        if (playerflags & QW_PF_VELOCITY1)
                velocity[0] = MSG_ReadShort();