CVS: bzflag/src/bzflag ServerLink.cxx,2.18,2.19 playing.cxx,2.174,2.175

[Tupone A. <at...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9653/src/bzflag

Modified Files:
	ServerLink.cxx playing.cxx 
Log Message:
Reduce size of MsgShotBegin


Index: ServerLink.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/ServerLink.cxx,v
retrieving revision 2.18
retrieving revision 2.19
diff -w -u -r2.18 -r2.19
--- ServerLink.cxx	31 Dec 2005 00:26:09 -0000	2.18
+++ ServerLink.cxx	2 Jan 2006 23:42:52 -0000	2.19
@@ -701,9 +701,12 @@
 
 void			ServerLink::sendBeginShot(const FiringInfo& info)
 {
-  char msg[FiringInfoPLen];
+  char msg[3];
   void* buf = msg;
-  buf = info.pack(buf);
+
+  buf = nboPackUByte(buf, info.shot.player);
+  buf = nboPackUShort(buf, info.shot.id);
+
   send(MsgShotBegin, sizeof(msg), msg);
 }
 

Index: playing.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/playing.cxx,v
retrieving revision 2.174
retrieving revision 2.175
diff -w -u -r2.174 -r2.175
--- playing.cxx	2 Jan 2006 22:29:00 -0000	2.174
+++ playing.cxx	2 Jan 2006 23:42:52 -0000	2.175
@@ -2398,9 +2398,15 @@
 
     case MsgShotBegin: {
       FiringInfo firingInfo;
-      msg = firingInfo.unpack(msg);
 
-      const int shooterid = firingInfo.shot.player;
+      PlayerId		shooterid;
+      uint16_t		id;
+
+      msg = nboUnpackUByte(msg, shooterid);
+      msg = nboUnpackUShort(msg, id);
+
+      firingInfo.shot.player = shooterid;
+      firingInfo.shot.id     = id;
 
       if (shooterid >= playerSize)
 	break;