--- ray/src/common/object.h	2003/02/25 02:47:21	2.9
+++ ray/src/common/object.h	2003/06/20 00:25:49	2.14
@@ -1,7 +1,14 @@
-/* RCSid $Id: object.h,v 2.9 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: object.h,v 2.14 2003/06/20 00:25:49 greg Exp $ */
 /*
  *  object.h - header file for routines using objects and object sets.
+ *
+ *  Include after "standard.h"
  */
+#ifndef _RAD_OBJECT_H_
+#define _RAD_OBJECT_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include "copyright.h"
 
@@ -36,10 +43,10 @@ typedef struct {
  */
 
 #ifndef  OBJECT
-#ifdef  BIGMEM
-#define  OBJECT		int4		/* index to object array */
+#ifdef  SMLMEM
+#define  OBJECT		int16		/* index to object array */
 #else
-#define  OBJECT		int2		/* index to object array */
+#define  OBJECT		int32		/* index to object array */
 #endif
 #endif
 
@@ -52,10 +59,10 @@ typedef struct {
 }  OBJREC;
 
 #ifndef  MAXOBJBLK
-#ifdef  BIGMEM
-#define  MAXOBJBLK	65535		/* maximum number of object blocks */
-#else
+#ifdef  SMLMEM
 #define  MAXOBJBLK	63		/* maximum number of object blocks */
+#else
+#define  MAXOBJBLK	65535		/* maximum number of object blocks */
 #endif
 #endif
 
@@ -74,48 +81,17 @@ extern OBJECT  nobjects;		/* # of objects */
  *  the objects in ascending order.
  */
 
-#define  MAXSET		127		/* maximum object set size */
+#define  MAXSET		511		/* maximum object set size */
 
 #define setfree(os)	free((void *)(os))
 
 extern void  (*addobjnotify[])();        /* people to notify of new objects */
 
-#ifdef NOPROTO
-
-extern int	objndx();
-extern int	lastmod();
-extern int	modifier();
-extern int	object();
-extern void	insertobject();
-extern void	clearobjndx();
-extern void	insertelem();
-extern void	deletelem();
-extern int	inset();
-extern int	setequal();
-extern void	setcopy();
-extern OBJECT *	setsave();
-extern void	setunion();
-extern void	setintersect();
-extern OCTREE	fullnode();
-extern void	objset();
-extern int	dosets();
-extern void	donesets();
-extern int	otype();
-extern void	objerror();
-extern int	readfargs();
-extern void	freefargs();
-extern void	readobj();
-extern void	getobject();
-extern int	newobject();
-extern void	freeobjects();
-extern int	free_os();
-
-#else
 					/* defined in modobject.c */
-extern int	objndx(OBJREC *op);
-extern int	lastmod(OBJECT obj, char *mname);
-extern int	modifier(char *name);
-extern int	object(char *oname);
+extern OBJECT	objndx(OBJREC *op);
+extern OBJECT	lastmod(OBJECT obj, char *mname);
+extern OBJECT	modifier(char *name);
+extern OBJECT	object(char *oname);
 extern void	insertobject(OBJECT obj);
 extern void	clearobjndx(void);
 					/* defined in objset.c */
@@ -141,9 +117,14 @@ extern void	freefargs(FUNARGS *fa);
 					/* defined in readobj.c */
 extern void	readobj(char *inpspec);
 extern void	getobject(char *name, FILE *fp);
-extern int	newobject();
+extern OBJECT	newobject();
 extern void	freeobjects(int firstobj, int nobjs);
 					/* defined in free_os.c */
 extern int	free_os(OBJREC *op);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_OBJECT_H_ */
+