--- ray/src/common/object.h 1989/02/02 10:34:17 1.1 +++ ray/src/common/object.h 1991/10/23 11:52:57 1.4 @@ -26,7 +26,7 @@ typedef struct { #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 */ @@ -45,10 +51,16 @@ typedef struct { long lastrno; /* last ray this was used with */ } OBJREC; +#ifndef MAXOBJBLK +#ifdef BIGMEM +#define MAXOBJBLK 4095 /* maximum number of object blocks */ +#else #define MAXOBJBLK 511 /* maximum number of object blocks */ +#endif +#endif extern OBJREC *objblock[MAXOBJBLK]; /* the object blocks */ -extern int nobjects; /* # of objects */ +extern OBJECT nobjects; /* # of objects */ #define objptr(obj) (objblock[(obj)>>6]+((obj)&077))