--- ray/src/common/octree.h	2003/02/25 02:47:21	2.6
+++ ray/src/common/octree.h	2003/06/27 06:53:21	2.10
@@ -1,10 +1,13 @@
-/* RCSid $Id: octree.h,v 2.6 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: octree.h,v 2.10 2003/06/27 06:53:21 greg Exp $ */
 /*
  *  octree.h - header file for routines using octrees.
  */
+#ifndef _RAD_OCTREE_H_
+#define _RAD_OCTREE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
-
 /*
  *	An octree is expressed as an integer which is either
  *	an index to eight other nodes, the empty tree, or an index
@@ -33,10 +36,10 @@
 #define  octti(ot)	(((ot)&03777)<<3)/* octree index in block */
 
 #ifndef  MAXOBLK
-#ifdef  BIGMEM
-#define  MAXOBLK	32767		/* maximum octree block */
-#else
+#ifdef  SMLMEM
 #define  MAXOBLK	4095		/* maximum octree block */
+#else
+#define  MAXOBLK	32767		/* maximum octree block */
 #endif
 #endif
 
@@ -79,20 +82,7 @@ extern CUBE  thescene;			/* the main scene */
 #define  O_HIT		1		/* intersection */
 #define  O_IN		2		/* cube contained entirely */
 
-#ifdef NOPROTO
 
-extern OCTREE	octalloc();
-extern void	octfree();
-extern void	octdone();
-extern OCTREE	combine();
-extern void	culocate();
-extern void	cucopy();
-extern int	incube();
-
-extern int	readoct();
-
-#else
-
 extern OCTREE	octalloc(void);
 extern void	octfree(OCTREE ot);
 extern void	octdone(void);
@@ -103,4 +93,12 @@ extern int	incube(CUBE *cu, FVECT pt);
 
 extern int	readoct(char *fname, int load, CUBE *scene, char *ofn[]);
 
+extern void	readscene(FILE *fp, int objsiz);
+extern void	writescene(int firstobj, int nobjs, FILE *fp);
+
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_OCTREE_H_ */
+