CVS update: Vanilla/ntserv

[Vanilla CVS Development <vanilla-devel@us.netrek.org>]

Date:	Monday March 6, 2000 @ 21:09
Author:	cameron

Update of /home/netrek/cvsroot/Vanilla/ntserv
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv11629

Modified Files:
	socket.c 
Log Message:
oops, undoing an unapproved patch

****************************************

Index: Vanilla/ntserv/socket.c
diff -u Vanilla/ntserv/socket.c:1.21 Vanilla/ntserv/socket.c:1.22
--- Vanilla/ntserv/socket.c:1.21	Mon Mar  6 20:18:11 2000
+++ Vanilla/ntserv/socket.c	Mon Mar  6 21:09:13 2000
@@ -1,4 +1,4 @@
-/* $Id: socket.c,v 1.21 2000/03/07 02:18:11 cameron Exp $
+/* $Id: socket.c,v 1.22 2000/03/07 03:09:13 cameron Exp $
  */
 
 /*
@@ -34,7 +34,6 @@
 #include "packets.h"
 #include "proto.h"
 #include "ltd_stats.h"
-#include "gnorm.h"
 
 #ifdef OOPS
 #ifdef MIPSEL
@@ -1404,8 +1403,8 @@
     if (target<0 || target>=MAXPLAYER || target==me->p_no) return;
     player= &players[target];
     if (player->p_flags & PFCLOAK) return;
-    if (hypot((double) gnorm_offset(me->p_x, player->p_x),
-	      (double) gnorm_offset(me->p_y, player->p_y)) < 
+    if (hypot((double) me->p_x-player->p_x,
+	      (double) me->p_y-player->p_y) < 
 	((double) TRACTDIST) * me->p_ship.s_tractrng) {
 	if (player->p_flags & PFDOCK) {
 	    players[player->p_docked].p_port[player->p_port[0]] = VACANT;
@@ -1445,8 +1444,8 @@
     if (target<0 || target>=MAXPLAYER || target==me->p_no) return;
     player= &players[target];
     if (player->p_flags & PFCLOAK) return;
-    if (hypot((double) gnorm_offset(me->p_x, player->p_x),
-	      (double) gnorm_offset(me->p_y, player->p_y)) < 
+    if (hypot((double) me->p_x-player->p_x,
+	      (double) me->p_y-player->p_y) < 
 	((double) TRACTDIST) * me->p_ship.s_tractrng) {
 	if (player->p_flags & PFDOCK) {
 	    players[player->p_docked].p_port[player->p_port[0]] = VACANT;