Modified packet offset computation

Author: Marek

data.c

@@ -370,40 +370,39 @@ void delete_obj(unsigned long id)
 	mem_free(q);
 }
 
-void put_long_long(char *p,unsigned long_long num)
+void put_long_long(char *p,unsigned long_long num, int *offset)
 {
-        p[0]=num&255;num>>=8;
-        p[1]=num&255;num>>=8;
-        p[2]=num&255;num>>=8;
-        p[3]=num&255;num>>=8;
-        p[4]=num&255;num>>=8;
-        p[5]=num&255;num>>=8;
-        p[6]=num&255;num>>=8;
-        p[7]=num&255;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);
 }
 
 
-void put_int(char *p,int num)
+void put_int(char *p,int num, int *offset)
 {
-        p[0]=num & 0xff;
-        p[1]=(num>>8) & 0xff;
-        p[2]=(num>>16) & 0xff;
-        p[3]=(num>>24) & 0xff;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);
 }
 
 
 int get_int(char *p)
 {
 	return	((p[0]&0xff) | ((p[1]&0xff)<<8) |
 		((p[2]&0xff)<<16) | ((p[3]&0xff)<<24));
-		
 }
 
 
-void put_int16(char *p, short num)
+void put_int16(char *p, short num, int *offset)
 {
-        p[0]=num & 0xff;
-        p[1]=(num>>8) & 0xff;
+	p[(*offset)++]=(char)(num & 0xff);num>>=8;
+	p[(*offset)++]=(char)(num & 0xff);
 }
 
 

data.h

@@ -224,11 +224,11 @@ extern struct it* new_obj(
 	int yspeed, 
 	void * data);
 void delete_obj(unsigned long id);
-extern void put_int(char *p,int num);
+extern void put_int(char *p,int num, int *offset);
 extern int get_int(char *p);
-extern void put_int16(char *p,short num);
+extern void put_int16(char *p,short num, int *offset);
 extern int get_int16(char *p);
-extern void put_long_long(char *p,unsigned long_long num);
+extern void put_long_long(char *p,unsigned long_long num, int *offset);
 extern unsigned long_long get_long_long(char *p);
 extern void free_sprites(int);
 

net.c

@@ -40,20 +40,20 @@ void send_packet(char *packet,int len,const struct sockaddr* addr,int sender,int
 	}
 	if (!p)return;  /* not enough memory */
 	memcpy(p+12,packet,len);
-	p[0]=crc&255;crc>>=8;  /* CRC 32 */
-	p[1]=crc&255;crc>>=8;
-	p[2]=crc&255;crc>>=8;
-	p[3]=crc&255;
+	p[0]=(char)(crc & 0xff);crc>>=8;  /* CRC 32 */
+	p[1]=(char)(crc & 0xff);crc>>=8;
+	p[2]=(char)(crc & 0xff);crc>>=8;
+	p[3]=(char)(crc & 0xff);
 
-	p[4]=sender&255;sender>>=8;  /* sender */
-	p[5]=sender&255;sender>>=8;
-	p[6]=sender&255;sender>>=8;
-	p[7]=sender&255;
+	p[4]=(char)(sender & 0xff);sender>>=8;  /* sender */
+	p[5]=(char)(sender & 0xff);sender>>=8;
+	p[6]=(char)(sender & 0xff);sender>>=8;
+	p[7]=(char)(sender & 0xff);
 
-	p[8]=recipient&255;recipient>>=8;  /* recipient */
-	p[9]=recipient&255;recipient>>=8;
-	p[10]=recipient&255;recipient>>=8;
-	p[11]=recipient&255;
+	p[8]=(char)(recipient & 0xff);recipient>>=8;  /* recipient */
+	p[9]=(char)(recipient & 0xff);recipient>>=8;
+	p[10]=(char)(recipient & 0xff);recipient>>=8;
+	p[11]=(char)(recipient & 0xff);
 
 	sendto(fd,p,len+12,0,addr,sizeof(*addr));
 }