Fix for the QW protocol problem by Dabb..

Some profiling changes as well..
Code now compiles with profiling support, will disable later..

AUTHORS

@@ -177,3 +177,9 @@ D: Q1/QW tree merging
 N: Jason Nelson
 E: jason_nelson@email.msn.com
 D: VC win32 support.
+
+N: Jukka Sorjonen
+E: jukka.sorjonen@asikkala.fi
+D: Bug squasher (see below).
+D: QW network protocol fixes.
+D: Found out why our VERSION was messing things up..

common/cl_tent.c

@@ -315,14 +315,15 @@ CL_ParseTEnt (void)
 		R_TeleportSplash (pos);
 		break;
 		
+#ifdef QUAKEWORLD
 	case TE_GUNSHOT:			// bullet hitting wall
+		cnt = MSG_ReadByte ();
 		pos[0] = MSG_ReadCoord ();
 		pos[1] = MSG_ReadCoord ();
 		pos[2] = MSG_ReadCoord ();
-		R_RunParticleEffect (pos, vec3_origin, 0, 20);
+		R_RunParticleEffect (pos, vec3_origin, 0, 20 * cnt);
 		break;
 		
-#ifdef QUAKEWORLD
 	case TE_BLOOD:				// bullets hitting body
 		cnt = MSG_ReadByte ();
 		pos[0] = MSG_ReadCoord ();
@@ -340,6 +341,13 @@ CL_ParseTEnt (void)
 #endif // QUAKEWORLD
 
 #ifdef UQUAKE
+	case TE_GUNSHOT:			// bullet hitting wall
+		pos[0] = MSG_ReadCoord ();
+		pos[1] = MSG_ReadCoord ();
+		pos[2] = MSG_ReadCoord ();
+		R_RunParticleEffect (pos, vec3_origin, 0, 20);
+		break;
+		
 // PGM 01/21/97 
 	case TE_BEAM:				// grappling hook beam
 		CL_ParseBeam (Mod_ForName("progs/beam.mdl", true));

common/common.h

@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <qtypes.h>
 #include <cvar.h>
 
-#define	MAX_INFO_STRING	196
+#define	MAX_INFO_STRING		512
 #define	MAX_SERVERINFO_STRING	512
 #define	MAX_LOCALINFO_STRING	32768
 

configure.in

@@ -3,7 +3,7 @@ AC_PREREQ(2.13)
 AC_INIT(common/crc.h)
 
 dnl Version of this release
-QF_VERSION=0.2-devel
+QF_VERSION=0.2-d
 VERSION=2.40
 AC_DEFINE_UNQUOTED(QF_VERSION,"$QF_VERSION")
 AC_DEFINE_UNQUOTED(VERSION,"$VERSION")
@@ -522,7 +522,7 @@ fi
 
 dnl We want warnings, lots of warnings...
 if test "x$GCC" = xyes; then
-   CFLAGS="$CFLAGS -Wall -Werror"
+   CFLAGS="$CFLAGS -Wall -Werror -pg"
 fi
 #   CFLAGS="$CFLAGS -Wall -pedantic"
 

qw_client/gl_rpart.c

@@ -99,7 +99,8 @@ void R_DrawParticles (void)
 		}
 
 		// hack a scale up to keep particles from disapearing
-		scale = (p->org[0] - r_origin[0])*vpn[0] + (p->org[1] - r_origin[1])*vpn[1]
+		scale = (p->org[0] - r_origin[0])*vpn[0] 
+			+ (p->org[1] - r_origin[1])*vpn[1]
 			+ (p->org[2] - r_origin[2])*vpn[2];
 		if (scale < 20)
 			scale = 1;

qw_client/r_part.c

@@ -378,73 +378,71 @@ void R_RocketTrail (vec3_t start, vec3_t end, int type)
 		VectorCopy (vec3_origin, p->vel);
 		p->die = cl.time + 2;
 
-		if (type == 4)
+		switch (type) {
-		{	// slight blood
+			case 4:
-			p->type = pt_slowgrav;
+				// slight blood
-			p->color = 67 + (rand()&3);
+				p->type = pt_slowgrav;
-			for (j=0 ; j<3 ; j++)
+				p->color = 67 + (rand()&3);
-				p->org[j] = start[j] + ((rand()%6)-3);
+				for (j=0 ; j<3 ; j++)
-			len -= 3;
+					p->org[j] = start[j] + ((rand()%6)-3);
-		}
+				len -= 3;
-		else if (type == 2)
+				break;
-		{	// blood
+			case 2:
-			p->type = pt_slowgrav;
+				// blood
-			p->color = 67 + (rand()&3);
+				p->type = pt_slowgrav;
-			for (j=0 ; j<3 ; j++)
+				p->color = 67 + (rand()&3);
-				p->org[j] = start[j] + ((rand()%6)-3);
+				for (j=0 ; j<3 ; j++)
-		}
+					p->org[j] = start[j] + ((rand()%6)-3);
-		else if (type == 6)
+				break;
-		{	// voor trail
+			case 6:
-			p->color = 9*16 + 8 + (rand()&3);
+				// voor trail
-			p->type = pt_static;
+				p->color = 9*16 + 8 + (rand()&3);
-			p->die = cl.time + 0.3;
+				p->type = pt_static;
-			for (j=0 ; j<3 ; j++)
+				p->die = cl.time + 0.3;
-				p->org[j] = start[j] + ((rand()&15)-8);
+				for (j=0 ; j<3 ; j++)
-		}
+					p->org[j] = start[j] + ((rand()&15)-8);
-		else if (type == 1)
+				break;
-		{	// smoke smoke
+			case 1:
-			p->ramp = (rand()&3) + 2;
+				// smoke smoke
-			p->color = ramp3[(int)p->ramp];
+				p->ramp = (rand()&3) + 2;
-			p->type = pt_fire;
+				p->color = ramp3[(int)p->ramp];
-			for (j=0 ; j<3 ; j++)
+				p->type = pt_fire;
-				p->org[j] = start[j] + ((rand()%6)-3);
+				for (j=0 ; j<3 ; j++)
-		}
+					p->org[j] = start[j] + ((rand()%6)-3);
-		else if (type == 0)
+				break;
-		{	// rocket trail
+			case 0:
-			p->ramp = (rand()&3);
+				// rocket trail
-			p->color = ramp3[(int)p->ramp];
+				p->ramp = (rand()&3);
-			p->type = pt_fire;
+				p->color = ramp3[(int)p->ramp];
-			for (j=0 ; j<3 ; j++)
+				p->type = pt_fire;
-				p->org[j] = start[j] + ((rand()%6)-3);
+				for (j=0 ; j<3 ; j++)
-		}
+					p->org[j] = start[j] + ((rand()%6)-3);
-		else if (type == 3 || type == 5)
+				break;
-		{	// tracer
+			case 3:
-			static int tracercount;
+			case 5:
+				// tracer
+				static int tracercount;
 
-			p->die = cl.time + 0.5;
+				p->die = cl.time + 0.5;
-			p->type = pt_static;
+				p->type = pt_static;
-			if (type == 3)
+				if (type == 3)
-				p->color = 52 + ((tracercount&4)<<1);
+					p->color = 52 + ((tracercount&4)<<1);
-			else
+				else
-				p->color = 230 + ((tracercount&4)<<1);
+					p->color = 230 + ((tracercount&4)<<1);
-			
+
-			tracercount++;
+				tracercount++;
+
+				VectorCopy (start, p->org);
+				if (tracercount & 1) {
+					p->vel[0] = 30*vec[1];
+					p->vel[1] = 30*-vec[0];
+				} else {
+					p->vel[0] = 30*-vec[1];
+					p->vel[1] = 30*vec[0];
+				}
+				break;
 
-			VectorCopy (start, p->org);
-			if (tracercount & 1)
-			{
-				p->vel[0] = 30*vec[1];
-				p->vel[1] = 30*-vec[0];
-			}
-			else
-			{
-				p->vel[0] = 30*-vec[1];
-				p->vel[1] = 30*vec[0];
-			}
-			
 		}
-		
-
 		VectorAdd (start, vec, start);
 	}
 }