CVS update: Vanilla/ntserv

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

Date:	Wednesday September 15, 1999 @ 21:42
Author:	cameron

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

Modified Files:
	redraw.c 
Log Message:
indi obs fix

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

Index: Vanilla/ntserv/redraw.c
diff -u Vanilla/ntserv/redraw.c:1.7 Vanilla/ntserv/redraw.c:1.8
--- Vanilla/ntserv/redraw.c:1.7	Thu Jun  3 05:09:48 1999
+++ Vanilla/ntserv/redraw.c	Wed Sep 15 21:42:14 1999
@@ -189,7 +189,9 @@
 	  me->p_y = -100000;
 	  new_warning (99,"Player lock lost while player rejoins.");
 	}
-	else if ( (pl->p_team != me->p_team) && (pl->p_team != 0)) {
+	else if ( (pl->p_team != me->p_team) && 
+                  (pl->p_team != 0) && 
+                  (me->p_team != 0)) {
 	  /* allow locking on independent players (robots) */
 	  new_warning (100,"Can only lock on own team.");
 	  me->p_x = -100000;
@@ -234,7 +236,7 @@
 
 	/* I am locked onto a valid planet */
 	pln = &planets[me->p_planet];
-	if (pln->pl_owner != me->p_team) {
+	if ((pln->pl_owner != me->p_team) && (me->p_team != 0)) {
 	    if ( (me->p_x == pln->pl_x) && (me->p_y == pln->pl_y) )
 	      /* we are sitting on the planet already, but it is not ours */
 	      /* [some day we should fall back to nearest team ship] */