--- ray/src/hd/rhdisp.c	1998/07/13 17:55:51	3.27
+++ ray/src/hd/rhdisp.c	1998/08/11 07:51:19	3.29
@@ -234,8 +234,11 @@ register PACKHEAD	*p;
 	for (i = p->nr; i--; ) {
 		hdray(ro, rd, hdlist[p->hd], gc, packra(p)[i].r);
 		d = hddepth(hdlist[p->hd], packra(p)[i].d);
-		VSUM(wp, ro, rd, d);		/* might be behind viewpoint */
-		dev_value(packra(p)[i].v, wp, rd);
+		if (d < .99*FHUGE) {
+			VSUM(wp, ro, rd, d);	/* might be behind viewpoint */
+			dev_value(packra(p)[i].v, rd, wp);
+		} else
+			dev_value(packra(p)[i].v, rd, NULL);
 	}
 #ifdef DEBUG
 	if (imm_mode) nimmrays += p->nr;
@@ -406,7 +409,7 @@ serv_result()			/* get next server result and process 
 		break;
 	case DS_OUTSECT:
 		do_outside = 1;
-		break;
+		goto noargs;
 	case DS_EYESEP:
 		if (msg.nbytes <= 1 || (eyesepdist = atof(buf)) <= FTINY)
 			error(INTERNAL, "bad eye separation from server");
@@ -422,20 +425,21 @@ serv_result()			/* get next server result and process 
 		}
 #endif
 		imm_mode = msg.type==DS_STARTIMM;
-		/* fall through */
+		goto noargs;
 	case DS_ACKNOW:
 	case DS_SHUTDOWN:
-		if (msg.nbytes) {
-			sprintf(errmsg,
-				"unexpected body with server message %d",
-					msg.type);
-			error(INTERNAL, errmsg);
-		}
-		break;
+		goto noargs;
 	default:
 		error(INTERNAL, "unrecognized result from server process");
 	}
 	return(msg.type);		/* return message type */
+noargs:
+	if (msg.nbytes) {
+		sprintf(errmsg, "unexpected body with server message %d",
+				msg.type);
+		error(INTERNAL, errmsg);
+	}
+	return(msg.type);
 readerr:
 	if (feof(stdin))
 		error(SYSTEM, "server process died");