[Vanilla Devel] CVS update: Vanilla/robots

[Vanilla CVS Development]

Date:	Sunday December 3, 2000 @ 11:52
Author:	jeffno

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

Modified Files:
	puckmove.c 
Log Message:
Fixed messages to display right team.

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

Index: Vanilla/robots/puckmove.c
diff -u Vanilla/robots/puckmove.c:1.7 Vanilla/robots/puckmove.c:1.8
--- Vanilla/robots/puckmove.c:1.7	Thu Oct 19 22:12:40 2000
+++ Vanilla/robots/puckmove.c	Sun Dec  3 11:52:20 2000
@@ -722,7 +722,7 @@
     {
 	if (ori_goalie != NULL)
 	{
-	    messOne(me->p_no,roboname,who, "Your team already has a goalie: O%c.", shipnos[ori_goalie->p_no]);
+	    messOne(me->p_no,roboname,who, "Your team already has a goalie: %2s.", ori_goalie->p_mapchars);
 	    return;
 	}
 	if (players[who].p_y < ORI_B)
@@ -742,7 +742,7 @@
         /*ori_goalie->p_ship.s_maxegntemp = 600;*/ /* Was 1000 -JGR */
         /*ori_goalie->p_ship.s_egncoolrate = 3;*/  /* Was 6 -JGR */
 
-	messAll(me->p_no,roboname,"%s (O%c) comes in as goalie for the Orions.", players[who].p_name, shipnos[who]);
+	messAll(me->p_no,roboname,"%s (%2s) comes in as goalie for the Orions.", players[who].p_name, players[who].p_mapchars);
     }
     else
     {
@@ -780,7 +780,7 @@
 	    messOne(me->p_no,roboname,who,"You aren't the goalie!");
 	    return;
 	}
-	messAll(me->p_no,roboname,"%s (O%c) is no longer guarding the net.", ori_goalie->p_name, shipnos[who]);
+	messAll(me->p_no,roboname,"%s (%2s) is no longer guarding the net.", ori_goalie->p_name, players[who].p_mapchars);
 	getship(&(ori_goalie->p_ship), ori_old_ship_type);
         ori_goalie->p_shield = ori_goalie->p_ship.s_maxshield / 2;
         ori_goalie->p_damage = ori_goalie->p_ship.s_maxdamage / 2;
@@ -979,7 +979,7 @@
 
     place_sitout(who);
 
-    messAll(me->p_no,roboname,"%s (O%c) is sitting out.", players[who].p_name, shipnos[who]);
+    messAll(me->p_no,roboname,"%s (%2s) is sitting out.", players[who].p_name, players[who].p_mapchars);
  
     track->t_flags |= PU_SITOUT ;
 
@@ -1258,8 +1258,8 @@
         if (track->t_flags & PU_SITOUT){
            if ( (j->p_x >= RINK_LEFT) && (j->p_x <= RINK_RIGHT) ){
               track->t_flags &= ~PU_SITOUT;
-              messAll(me->p_no,roboname,"%s (O%c) is back on the ice.",
-                       players[i].p_name, shipnos[i]);
+              messAll(me->p_no,roboname,"%s (%2s) is back on the ice.",
+                       players[i].p_name, players[i].p_mapchars);
 	    }
 	 }