--- ray/src/common/modobject.c	1991/07/29 15:47:46	1.2
+++ ray/src/common/modobject.c	2003/07/17 09:21:29	2.10
@@ -1,13 +1,14 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: modobject.c,v 2.10 2003/07/17 09:21:29 schorsch Exp $";
 #endif
-
 /*
  *  Routines for tracking object modifiers
+ *
+ *  External symbols declared in object.h
  */
 
+#include "copyright.h"
+
 #include  "standard.h"
 
 #include  "object.h"
@@ -15,28 +16,50 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "otypes.h"
 
 
-extern int  (*addobjnotify[])();	/* people to notify of new objects */
-
 static struct ohtab {
 	int  hsiz;			/* current table size */
 	OBJECT  *htab;			/* table, if allocated */
 }  modtab = {100, NULL}, objtab = {1000, NULL};	/* modifiers and objects */
 
+static int  otndx(char *, struct ohtab *);
 
-#ifdef  GETOBJ
-int
-object(oname)			/* get an object number from its name */
-char  *oname;
+
+OBJECT
+objndx(op)			/* get object number from pointer */
+register OBJREC  *op;
 {
-	register int  ndx;
+	register int  i, j;
 
-	ndx = otndx(oname, &objtab);
-	return(objtab.htab[ndx]);
+	for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
+		j = op - objblock[i];
+		if (j >= 0 && j < OBJBLKSIZ)
+			return((i<<OBJBLKSHFT) + j);
+	}
+	return(OVOID);
 }
-#endif
 
 
-int
+OBJECT
+lastmod(obj, mname)		/* find modifier definition before obj */
+OBJECT  obj;
+char  *mname;
+{
+	register OBJREC  *op;
+	register int  i;
+
+	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);
+	}
+	return(OVOID);
+}
+
+
+OBJECT
 modifier(mname)			/* get a modifier number from its name */
 char  *mname;
 {
@@ -47,24 +70,56 @@ char  *mname;
 }
 
 
+#ifdef  GETOBJ
+OBJECT
+object(oname)			/* get an object number from its name */
+char  *oname;
+{
+	register int  ndx;
+
+	ndx = otndx(oname, &objtab);
+	return(objtab.htab[ndx]);
+}
+#endif
+
+
+void
 insertobject(obj)		/* insert new object into our list */
 register OBJECT  obj;
 {
 	register int  i;
 
-#ifdef  GETOBJ
-	i = otndx(objptr(obj)->oname, &objtab);
-	objtab.htab[i] = obj;
-#endif
 	if (ismodifier(objptr(obj)->otype)) {
 		i = otndx(objptr(obj)->oname, &modtab);
 		modtab.htab[i] = obj;
 	}
+#ifdef  GETOBJ
+	else {
+		i = otndx(objptr(obj)->oname, &objtab);
+		objtab.htab[i] = obj;
+	}
+#endif
 	for (i = 0; addobjnotify[i] != NULL; i++)
 		(*addobjnotify[i])(obj);
 }
 
 
+void
+clearobjndx()			/* clear object hash tables */
+{
+	if (modtab.htab != NULL) {
+		free((void *)modtab.htab);
+		modtab.htab = NULL;
+		modtab.hsiz = 100;
+	}
+	if (objtab.htab != NULL) {
+		free((void *)objtab.htab);
+		objtab.htab = NULL;
+		objtab.hsiz = 100;
+	}
+}
+
+
 static int
 nexthsiz(oldsiz)		/* return next hash table size */
 int  oldsiz;
@@ -82,18 +137,6 @@ int  oldsiz;
 
 
 static int
-shash(s)			/* hash a string */
-register char  *s;
-{
-	register int  h = 0;
-
-	while (*s)
-		h = (h<<1 & 0x7fff) ^ *s++;
-	return(h);
-}
-
-
-static int
 otndx(name, tab)		/* get object table index for name */
 char  *name;
 register struct ohtab  *tab;
@@ -129,6 +172,6 @@ tryagain:
 			i = otndx(objptr(oldhtab[ndx])->oname, tab);
 			tab->htab[i] = oldhtab[ndx];
 		}
-	free((char *)oldhtab);
+	free((void *)oldhtab);
 	goto tryagain;			/* should happen only once! */
 }