--- ray/src/common/modobject.c	1996/02/12 17:14:59	2.3
+++ ray/src/common/modobject.c	1998/11/05 16:51:26	2.6
@@ -31,10 +31,10 @@ register OBJREC  *op;
 {
 	register int  i, j;
 
-	for (i = nobjects>>6; i >= 0; i--) {
+	for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
 		j = op - objblock[i];
-		if (j >= 0 && j < 077)
-			return((i<<6) + j);
+		if (j >= 0 && j < OBJBLKSIZ)
+			return((i<<OBJBLKSHFT) + j);
 	}
 	return(OVOID);
 }
@@ -48,7 +48,10 @@ char  *mname;
 	register OBJREC  *op;
 	register int  i;
 
-	for (i = obj; i-- > 0; ) {
+	i = modifier(mname);		/* try hash table first */
+	if (i < obj)
+		return(i);
+	for (i = obj; i-- > 0; ) {	/* need to search */
 		op = objptr(i);
 		if (ismodifier(op->otype) && !strcmp(op->oname, mname))
 			return(i);