made various things take const pointers (optimizer hint), commented out and/or remove...

[xonotic/darkplaces.git] / protocol.c

diff --git a/protocol.c b/protocol.c
index 95ded37bd19c5de23220003208cc3e9bcf71ad56..0c2d844ead120c179ab1025026d8a5c7c70254ef 100644 (file)
--- a/protocol.c
+++ b/protocol.c
@@ -44,8 +44,18 @@ void EntityFrame_AckFrame(entity_database_t *d, int frame)
 // (server) clears frame, to prepare for adding entities
 void EntityFrame_Clear(entity_frame_t *f, vec3_t eye)
 {
-       memset(f, 0, sizeof(*f));
-       VectorCopy(eye, f->eye);
+       //memset(f, 0, sizeof(*f));
+       f->time = 0;
+       f->framenum = 0;
+       f->numentities = 0;
+       if (eye == NULL)
+       {
+               VectorClear(f->eye);
+       }
+       else
+       {
+               VectorCopy(eye, f->eye);
+       }
 }
 
 // (server) allocates an entity slot in frame, returns NULL if full
@@ -64,7 +74,7 @@ entity_state_t *EntityFrame_NewEntity(entity_frame_t *f, int number)
 void EntityFrame_FetchFrame(entity_database_t *d, int framenum, entity_frame_t *f)
 {
        int i, n;
-       memset(f, 0, sizeof(*f));
+       EntityFrame_Clear(f, NULL);
        for (i = 0;i < d->numframes && d->frames[i].framenum < framenum;i++);
        if (i < d->numframes && framenum == d->frames[i].framenum)
        {
@@ -275,17 +285,17 @@ void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
                        if (bits & E_ANGLE3)
                                MSG_WriteAngle(msg, ent->angles[2]);
                        if (bits & E_MODEL1)
-                               MSG_WriteByte(msg, ent->modelindex & 0x00FF);
+                               MSG_WriteByte(msg, ent->modelindex & 0xFF);
                        if (bits & E_MODEL2)
-                               MSG_WriteByte(msg, ent->modelindex & 0xFF00);
+                               MSG_WriteByte(msg, (ent->modelindex >> 8) & 0xFF);
                        if (bits & E_FRAME1)
-                               MSG_WriteByte(msg, ent->frame & 0x00FF);
+                               MSG_WriteByte(msg, ent->frame & 0xFF);
                        if (bits & E_FRAME2)
-                               MSG_WriteByte(msg, ent->frame & 0xFF00);
+                               MSG_WriteByte(msg, (ent->frame >> 8) & 0xFF);
                        if (bits & E_EFFECTS1)
-                               MSG_WriteByte(msg, ent->effects & 0x00FF);
+                               MSG_WriteByte(msg, ent->effects & 0xFF);
                        if (bits & E_EFFECTS2)
-                               MSG_WriteByte(msg, ent->effects & 0xFF00);
+                               MSG_WriteByte(msg, (ent->effects >> 8) & 0xFF);
                        if (bits & E_COLORMAP)
                                MSG_WriteByte(msg, ent->colormap);
                        if (bits & E_SKIN)
@@ -316,7 +326,9 @@ void EntityFrame_Read(entity_database_t *d)
        entity_state_t *e, baseline, *old, *oldend;
 
        ClearStateToDefault(&baseline);
-       memset(f, 0, sizeof(*f));
+
+       EntityFrame_Clear(f, NULL);
+
        // read the frame header info
        f->time = cl.mtime[0];
        number = MSG_ReadLong();
@@ -429,17 +441,17 @@ void EntityFrame_Read(entity_database_t *d)
                        if (bits & E_ANGLE3)
                                e->angles[2] = MSG_ReadAngle();
                        if (bits & E_MODEL1)
-                               e->modelindex = (e->modelindex & 0xFF00) | MSG_ReadByte();
+                               e->modelindex = (e->modelindex & 0xFF00) | (unsigned int) MSG_ReadByte();
                        if (bits & E_MODEL2)
-                               e->modelindex = (e->modelindex & 0x00FF) | (MSG_ReadByte() << 8);
+                               e->modelindex = (e->modelindex & 0x00FF) | ((unsigned int) MSG_ReadByte() << 8);
                        if (bits & E_FRAME1)
-                               e->frame = (e->frame & 0xFF00) | MSG_ReadByte();
+                               e->frame = (e->frame & 0xFF00) | (unsigned int) MSG_ReadByte();
                        if (bits & E_FRAME2)
-                               e->frame = (e->frame & 0x00FF) | (MSG_ReadByte() << 8);
+                               e->frame = (e->frame & 0x00FF) | ((unsigned int) MSG_ReadByte() << 8);
                        if (bits & E_EFFECTS1)
-                               e->effects = (e->effects & 0xFF00) | MSG_ReadByte();
+                               e->effects = (e->effects & 0xFF00) | (unsigned int) MSG_ReadByte();
                        if (bits & E_EFFECTS2)
-                               e->effects = (e->effects & 0x00FF) | (MSG_ReadByte() << 8);
+                               e->effects = (e->effects & 0x00FF) | ((unsigned int) MSG_ReadByte() << 8);
                        if (bits & E_COLORMAP)
                                e->colormap = MSG_ReadByte();
                        if (bits & E_SKIN)