CVS: bzflag/src/bzflag ServerLink.cxx,1.17,1.18 World.cxx,1.7,1.8 playing.cxx,1.56,1.57

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv11240/src/bzflag

Modified Files:
	ServerLink.cxx World.cxx playing.cxx 
Log Message:
1.7e4 release cleanup

Index: ServerLink.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/ServerLink.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ServerLink.cxx	2001/11/15 09:37:07	1.17
+++ ServerLink.cxx	2001/11/27 19:44:41	1.18
@@ -94,7 +94,7 @@
 				state(SocketError),	// assume failure
 				fd(-1)			// assume failure
 {
-  int i, err, wait;
+  int i, err;
   char cServerVersion[128];
 
   struct protoent* p;

Index: World.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/World.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- World.cxx	2001/11/26 19:48:54	1.7
+++ World.cxx	2001/11/27 19:44:41	1.8
@@ -157,8 +157,8 @@
   for (int i = 1; i < NumTeams; i++) {
     float nx = pos[0] - bases[i][0];
     float ny = pos[1] - bases[i][1];
-    float rx = cosf(atanf(ny/nx)-bases[i][3]) * sqrt((ny * ny) + (nx * nx));
-    float ry = sinf(atanf(ny/nx)-bases[i][3]) * sqrt((ny * ny) + (nx * nx));
+    float rx = (float) (cosf(atanf(ny/nx)-bases[i][3]) * sqrt((ny * ny) + (nx * nx)));
+    float ry = (float) (sinf(atanf(ny/nx)-bases[i][3]) * sqrt((ny * ny) + (nx * nx)));
     if(fabsf(rx) < bases[i][4] &&
        fabsf(ry) < bases[i][5]) {
       float nz = (bases[i][2] > 0) ? (bases[i][2] + 1) : 0;

Index: playing.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/playing.cxx,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- playing.cxx	2001/11/27 08:29:18	1.56
+++ playing.cxx	2001/11/27 19:44:41	1.57
@@ -2048,7 +2048,7 @@
 
   // ramp up to MaxRange as target comes to dead center
   const float f = (angleCosOffBoresight - SafeAngle) / (1.0f - SafeAngle);
-  return (MinRange + f * (MaxRange - MinRange)) * (1 - fractionOfTries * 0.6);
+  return (float)((MinRange + f * (MaxRange - MinRange)) * (1.0f - fractionOfTries * 0.6));
 }
 
 static void		restartPlaying()