X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=protocol.c;h=de55ed3750fbf2510da1d83bae2bf4a4f05ebbdc;hb=9467a5d4d63a1d3587eff10afae41a853dea68f5;hp=6a4e435e955886c68ffb2e090108e380a23cf6be;hpb=43834947ad92401e07b3f39d1ab1ae42d07a1972;p=xonotic%2Fdarkplaces.git

diff --git a/protocol.c b/protocol.c
index 6a4e435e..de55ed37 100644
--- a/protocol.c
+++ b/protocol.c
@@ -521,6 +521,9 @@ qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numnumbers
 		}
 		else
 		{
+			// save the cursize value in case we overflow and have to rollback
+			int oldcursize = msg->cursize;
+
 			// An update.
 			sendflags = client->csqcentitysendflags[number];
 			// Nothing to send? FINE.
@@ -531,8 +534,6 @@ qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numnumbers
 				sendflags = 0xFFFFFF;
 
 			// write an update
-			// save the cursize value in case we overflow and have to rollback
-			int oldcursize = msg->cursize;
 			if (PRVM_serveredictfunction(ed, SendEntity))
 			{
 				if(!sectionstarted)
@@ -2539,8 +2540,8 @@ static void EntityState5_ReadUpdate(entity_state_t *s, int number)
 			if (!skeleton->relativetransforms || skeleton->model != model)
 			{
 				skeleton->model = model;
-				skeleton->relativetransforms = (matrix4x4_t *) Mem_Realloc(cls.levelmempool, skeleton->relativetransforms, sizeof(*skeleton->relativetransforms) * skeleton->model->num_bones);
-				for (bonenum = 0;bonenum < model->num_bones;bonenum++)
+				skeleton->relativetransforms = (matrix4x4_t *) Mem_Realloc(cls.levelmempool, skeleton->relativetransforms, sizeof(*skeleton->relativetransforms) * numbones);
+				for (bonenum = 0;bonenum < numbones;bonenum++)
 					skeleton->relativetransforms[bonenum] = identitymatrix;
 			}
 			for (bonenum = 0;bonenum < numbones;bonenum++)
@@ -2831,7 +2832,7 @@ void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum)
 			d->packetlog[i].packetnumber = 0;
 }
 
-qboolean EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t **states, int viewentnum, int movesequence, qboolean need_empty)
+qboolean EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t **states, int viewentnum, unsigned int movesequence, qboolean need_empty)
 {
 	prvm_prog_t *prog = SVVM_prog;
 	const entity_state_t *n;