Define BASE_OBJECT in terms of SIMPLE_OBJECT (i.e. reflect the fact that BASE_OBJECT "derives" from SIMPLE_OBJECT in BASE_OBJECT's definition)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3601 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-01-30 16:27:11 +00:00
parent ad5e3cf920
commit f22d4e100b
1 changed files with 8 additions and 11 deletions

View File

@ -73,26 +73,23 @@ typedef enum _object_type
#define NEXTOBJ(pointerType) \
pointerType *psNext /* Pointer to next object in list */
#define BASE_ELEMENTS(pointerType) \
BASE_ELEMENTS1(pointerType); \
NEXTOBJ(pointerType); \
BASE_ELEMENTS2(pointerType)
#define SIMPLE_ELEMENTS(pointerType) \
BASE_ELEMENTS1(pointerType); \
#define SIMPLE_ELEMENTS(pointerType) \
BASE_ELEMENTS1(pointerType); \
NEXTOBJ(pointerType)
#define BASE_ELEMENTS(pointerType) \
SIMPLE_ELEMENTS(pointerType); \
BASE_ELEMENTS2(pointerType)
typedef struct _base_object
{
BASE_ELEMENTS( struct _base_object );
}
BASE_OBJECT;
} BASE_OBJECT;
typedef struct SIMPLE_OBJECT
{
SIMPLE_ELEMENTS( struct SIMPLE_OBJECT );
}
SIMPLE_OBJECT;
} SIMPLE_OBJECT;
static inline bool isDead(BASE_OBJECT *psObj)
{