CVS update: Vanilla/ntserv

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

Date:	Tuesday September 21, 1999 @ 0:06
Author:	unbelver

Update of /home/netrek/cvsroot/Vanilla/ntserv
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv27601

Modified Files:
	redraw.c 
Log Message:
	* ntserv/redraw.c (auto_features): A check to see if target of
	twarp was a base was in the wrong place and masking out checks for
	twarp abort conditions.  Check moved to appropriate place.


--Carlos V.



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

Index: Vanilla/ntserv/redraw.c
diff -u Vanilla/ntserv/redraw.c:1.8 Vanilla/ntserv/redraw.c:1.9
--- Vanilla/ntserv/redraw.c:1.8	Wed Sep 15 21:42:14 1999
+++ Vanilla/ntserv/redraw.c	Tue Sep 21 00:06:25 1999
@@ -503,7 +503,6 @@
 	pl = &players[me->p_playerl];
 	if (pl->p_status != PALIVE)
 	    me->p_flags &= ~PFPLOCK;
-	if (pl->p_ship.s_type == STARBASE) {
 #ifdef SB_TRANSWARP
 	if (me->p_flags & PFTWARP){
 	  if (pl->p_status != PALIVE){
@@ -539,6 +538,7 @@
 	  }
 	}
 #endif
+	if (pl->p_ship.s_type == STARBASE) {
 	    dist = hypot((double) (me->p_x - pl->p_x),
 		(double) (me->p_y - pl->p_y));