nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Typedef getloc_flags_t for struct unpacked_coord.getloc_flags and related.

Browse Source
This commit is contained in:
nhkeni
2022-03-17 17:17:13 -04:00
parent fc5e991b06
commit e2d5013e01
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sp_lev.h
+2 -1
View File
@@ -97,9 +97,10 @@ struct sp_coder {
*/ */
#define packed_coord long #define packed_coord long
typedef uint32_t getloc_flags_t;
typedef struct { typedef struct {
xchar is_random; xchar is_random;
long getloc_flags; getloc_flags_t getloc_flags;
int x, y; int x, y;
} unpacked_coord; } unpacked_coord;
src/sp_lev.c
+6 -6
View File
@@ -37,8 +37,8 @@ static void maybe_add_door(int, int, struct mkroom *);
static void link_doors_rooms(void); static void link_doors_rooms(void);
static int rnddoor(void); static int rnddoor(void);
static int rndtrap(void); static int rndtrap(void);
static void get_location(xchar *, xchar *, int, struct mkroom *); static void get_location(xchar *, xchar *, getloc_flags_t, struct mkroom *);
static boolean is_ok_location(xchar, xchar, int); static boolean is_ok_location(xchar, xchar, getloc_flags_t);
static unpacked_coord get_unpacked_coord(long, int); static unpacked_coord get_unpacked_coord(long, int);
static void get_room_loc(xchar *, xchar *, struct mkroom *); static void get_room_loc(xchar *, xchar *, struct mkroom *);
static void get_free_room_loc(xchar *, xchar *, struct mkroom *, static void get_free_room_loc(xchar *, xchar *, struct mkroom *,
@@ -1081,11 +1081,11 @@ rndtrap(void)
* Coordinates in special level files are handled specially: * Coordinates in special level files are handled specially:
* *
* if x or y is < 0, we generate a random coordinate. * if x or y is < 0, we generate a random coordinate.
* The "humidity" flag is used to insure that engravings aren't * The "humidity" flag is used to ensure that engravings aren't
* created underwater, or eels on dry land. * created underwater, or eels on dry land.
*/ */
static void static void
get_location(xchar *x, xchar *y, int humidity, struct mkroom* croom) get_location(xchar *x, xchar *y, getloc_flags_t humidity, struct mkroom* croom)
{ {
int cpt = 0; int cpt = 0;
int mx, my, sx, sy; int mx, my, sx, sy;
@@ -1152,7 +1152,7 @@ get_location(xchar *x, xchar *y, int humidity, struct mkroom* croom)
} }
static boolean static boolean
is_ok_location(xchar x, xchar y, int humidity) is_ok_location(xchar x, xchar y, getloc_flags_t humidity)
{ {
register int typ = levl[x][y].typ; register int typ = levl[x][y].typ;
@@ -1193,7 +1193,7 @@ get_unpacked_coord(long loc, int defhumidity)
if (loc & SP_COORD_IS_RANDOM) { if (loc & SP_COORD_IS_RANDOM) {
c.x = c.y = -1; c.x = c.y = -1;
c.is_random = 1; c.is_random = 1;
c.getloc_flags = (loc & ~SP_COORD_IS_RANDOM); c.getloc_flags = (getloc_flags_t)(loc & ~SP_COORD_IS_RANDOM);
if (!c.getloc_flags) if (!c.getloc_flags)
c.getloc_flags = defhumidity; c.getloc_flags = defhumidity;
} else { } else {