--- ray/src/common/object.h	1997/12/03 11:13:12	2.4
+++ ray/src/common/object.h	1998/11/05 16:51:26	2.6
@@ -36,9 +36,9 @@ typedef struct {
 
 #ifndef  OBJECT
 #ifdef  BIGMEM
-#define  OBJECT		int		/* index to object array */
+#define  OBJECT		int4		/* index to object array */
 #else
-#define  OBJECT		short		/* index to object array */
+#define  OBJECT		int2		/* index to object array */
 #endif
 #endif
 
@@ -52,16 +52,18 @@ typedef struct {
 
 #ifndef  MAXOBJBLK
 #ifdef  BIGMEM
-#define  MAXOBJBLK	32767		/* maximum number of object blocks */
+#define  MAXOBJBLK	65535		/* maximum number of object blocks */
 #else
-#define  MAXOBJBLK	511		/* maximum number of object blocks */
+#define  MAXOBJBLK	31		/* maximum number of object blocks */
 #endif
 #endif
 
 extern OBJREC  *objblock[MAXOBJBLK];	/* the object blocks */
 extern OBJECT  nobjects;		/* # of objects */
 
-#define  objptr(obj)	(objblock[(obj)>>6]+((obj)&077))
+#define  OBJBLKSHFT	9
+#define  OBJBLKSIZ	(1<<OBJBLKSHFT)	/* object block size */
+#define  objptr(obj)	(objblock[(obj)>>OBJBLKSHFT]+((obj)&(OBJBLKSIZ-1)))
 
 #define  OVOID		(-1)		/* void object */
 #define  VOIDID		"void"		/* void identifier */