From 8caaf894e52e149d4a379031348209bb612615fb Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 2 May 2020 16:50:50 -0700 Subject: [PATCH] makedefs vs dungeon.h This works for me. It might be better to move d_level into its own header and include that instead including dungeon.h. --- include/dungeon.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/dungeon.h b/include/dungeon.h index 34ae5afdf..eba96d8bd 100644 --- a/include/dungeon.h +++ b/include/dungeon.h @@ -6,6 +6,13 @@ #ifndef DUNGEON_H #define DUNGEON_H +typedef struct d_level { /* basic dungeon level element */ + xchar dnum; /* dungeon number */ + xchar dlevel; /* level number */ +} d_level; + +#if !defined(MAKEDEFS_C) && !defined(MDLIB_C) + typedef struct d_flags { /* dungeon/level type flags */ Bitfield(town, 1); /* is this a town? (levels only) */ Bitfield(hellish, 1); /* is this part of hell? */ @@ -15,11 +22,6 @@ typedef struct d_flags { /* dungeon/level type flags */ Bitfield(unused, 1); /* etc... */ } d_flags; -typedef struct d_level { /* basic dungeon level element */ - xchar dnum; /* dungeon number */ - xchar dlevel; /* level number */ -} d_level; - typedef struct s_level { /* special dungeon level element */ struct s_level *next; d_level dlevel; /* dungeon & level numbers */ @@ -264,4 +266,6 @@ typedef struct mapseen { struct cemetery *final_resting_place; /* same as level.bonesinfo */ } mapseen; +#endif /* !MAKEDEFS_C && !MDLIB_C */ + #endif /* DUNGEON_H */