*** xpilot-a/src/client/paintobjects.c	Wed Sep 16 21:35:41 1998
--- paintobjects.c	Tue Mar 23 15:50:07 1999
***************
*** 792,797 ****
--- 792,805 ----
  #endif
  			XChangeGC(dpy, gc, mask, &gcv);
  		    }
+ 		}
+ 		else
+ 		  if (gcv.line_style != LineSolid) {
+ 		    gcv.line_style = LineSolid;
+ 		    mask = GCLineStyle;
+ 		    XChangeGC(dpy, gc, mask, &gcv);
+ 		  }
+ 		
  #if !defined(_WINDOWS) || defined(PENS_OF_PLENTY)
  		    SET_FG(colors[ship_color].pixel);
  #else
***************
*** 835,840 ****
--- 843,853 ----
  			    }
  			}
  
+ 			if (ecolor==-1 && scolor==-1 && power_s>10) {
+ 			  scolor = ship_color;
+ 			  radius=(int) power_s;
+ 			  half_radius=radius>>1;
+ 			}
  			if (ecolor != -1) {		/* outer shield */
  				SET_FG(colors[ecolor].pixel);
  			    rd.drawArc(dpy, p_draw, gc, 
***************
*** 859,865 ****
  					  WINSCALE(radius), WINSCALE(radius),
  					  0, 64 * 360);
  			}
! 		    }	/* draw deflectors and shields */
  		}	/* .shield .cloak .deflector */
  	    } /* !roundDelay */
  	}
--- 872,878 ----
  					  WINSCALE(radius), WINSCALE(radius),
  					  0, 64 * 360);
  			}
! 		    	/* draw deflectors and shields */
  		}	/* .shield .cloak .deflector */
  	    } /* !roundDelay */
  	}