--- ray/src/common/object.h	1990/09/06 23:32:38	1.2
+++ ray/src/common/object.h	1997/12/03 11:13:12	2.4
@@ -19,14 +19,14 @@ typedef struct {
 	short  nsargs;			/* # of string arguments */
 	short  nfargs;			/* # of real arguments */
 	char  **sarg;			/* string arguments */
-	double  *farg;			/* real arguments */
+	FLOAT  *farg;			/* real arguments */
 #ifdef  IARGS
 	short  niargs;			/* # of integer arguments */
 	long  *iarg;			/* integer arguments */
 #endif
 }  FUNARGS;
 
-#define  MAXSTR		512		/* maximum string length */
+#define  MAXSTR		128		/* maximum string length */
 
 /*
  *	An object is defined as an index into an array of
@@ -34,7 +34,13 @@ typedef struct {
  *	and the modifier index.
  */
 
-typedef short  OBJECT;			/* index into object array */
+#ifndef  OBJECT
+#ifdef  BIGMEM
+#define  OBJECT		int		/* index to object array */
+#else
+#define  OBJECT		short		/* index to object array */
+#endif
+#endif
 
 typedef struct {
 	OBJECT  omod;			/* modifier number */
@@ -42,10 +48,15 @@ typedef struct {
 	char  *oname;			/* object name */
 	FUNARGS  oargs;			/* object specification */
 	char  *os;			/* object structure */
-	long  lastrno;			/* last ray this was used with */
 }  OBJREC;
 
+#ifndef  MAXOBJBLK
+#ifdef  BIGMEM
+#define  MAXOBJBLK	32767		/* maximum number of object blocks */
+#else
 #define  MAXOBJBLK	511		/* maximum number of object blocks */
+#endif
+#endif
 
 extern OBJREC  *objblock[MAXOBJBLK];	/* the object blocks */
 extern OBJECT  nobjects;		/* # of objects */
@@ -61,3 +72,7 @@ extern OBJECT  nobjects;		/* # of objects */
  */
 
 #define  MAXSET		127		/* maximum object set size */
+
+OBJECT	*setsave();
+
+#define setfree(os)	free((char *)(os))