Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26407/src
Modified Files:
local.c
Log Message:
Client support for new server ping-pong plasma code (to tell whether plasma is hostile or friendly)
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- local.c 13 Jun 2006 11:18:23 -0000 1.43
+++ local.c 23 Jun 2006 10:07:07 -0000 1.44
@@ -2210,10 +2210,7 @@
ptorpTeam = 2;
}
}
- if (pt->pt_owner != me->p_no && ((pt->pt_war & me->p_team) ||
- (players[pt->pt_owner].
- p_team & (me->p_hostile | me->
- p_swar))))
+ if (pt->pt_war & me->p_team)
{
W_WriteBitmap (dx - (BMP_CPLASMATORP_WIDTH / 2),
dy - (BMP_CPLASMATORP_HEIGHT / 2),
@@ -2232,14 +2229,10 @@
clearzone[2][clearcount] = BMP_CPLASMATORP_WIDTH;
clearzone[3][clearcount] = BMP_CPLASMATORP_HEIGHT;
clearcount++;
- }
- else
- {
- /* needmore: if(pt->pt_war & me->p_team) */
- if (pt->pt_owner != me->p_no && ((pt->pt_war & me->p_team) ||
- (players[pt->pt_owner].
- p_team & (me->p_hostile | me->
- p_swar))))
+ }
+ else
+ {
+ if (pt->pt_war & me->p_team)
{
W_WriteBitmap (dx - (eplasmatorp_width / 2),
dy - (eplasmatorp_height / 2),