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

Fix: IS_SUBROOM_INDEX range

Browse Source 
The macro (currently unused, I think) for checking whether a particular
index designates a subroom was off by one on the maximum allowable
value.

Because of the dedicated extra space for the g.rooms array terminator
flag (hx == -1), subroom indices in g.rooms are set out in the range
[MAXNROFROOMS+1, MAXNROFROOMS*2], inclusive.

Also some minor formatting tweaks.
This commit is contained in:
Michael Meyer
2022-08-24 21:38:56 -04:00
committed by PatR
parent d74791f4a2
commit d1f4e7df85
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/mkroom.h
View File

@@ -100,10 +100,11 @@ enum roomtype_types {
#define IS_ROOM_PTR(x) ((x) >= g.rooms && (x) < g.rooms + MAXNROFROOMS) #define IS_ROOM_PTR(x) ((x) >= g.rooms && (x) < g.rooms + MAXNROFROOMS)
#define IS_ROOM_INDEX(x) ((x) >= 0 && (x) < MAXNROFROOMS) #define IS_ROOM_INDEX(x) ((x) >= 0 && (x) < MAXNROFROOMS)
#define IS_SUBROOM_PTR(x) ((x) >= g.subrooms && (x) < g.subrooms + MAXNROFROOMS) #define IS_SUBROOM_PTR(x) \
#define IS_SUBROOM_INDEX(x) ((x) > MAXNROFROOMS && (x) < (MAXNROFROOMS * 2)) ((x) >= g.subrooms && (x) < g.subrooms + MAXNROFROOMS)
#define ROOM_INDEX(x) ((x) -g.rooms) #define IS_SUBROOM_INDEX(x) ((x) > MAXNROFROOMS && (x) <= (MAXNROFROOMS * 2))
#define SUBROOM_INDEX(x) ((x) -g.subrooms) #define ROOM_INDEX(x) ((x) - g.rooms)
#define SUBROOM_INDEX(x) ((x) - g.subrooms)
#define IS_LAST_ROOM_PTR(x) (ROOM_INDEX(x) == g.nroom) #define IS_LAST_ROOM_PTR(x) (ROOM_INDEX(x) == g.nroom)
#define IS_LAST_SUBROOM_PTR(x) (!g.nsubroom || SUBROOM_INDEX(x) == g.nsubroom) #define IS_LAST_SUBROOM_PTR(x) (!g.nsubroom || SUBROOM_INDEX(x) == g.nsubroom)

4
src/mklev.c
View File

@@ -313,7 +313,7 @@ makerooms(void)
iflags.in_lua = g.in_mk_themerooms = TRUE; iflags.in_lua = g.in_mk_themerooms = TRUE;
g.themeroom_failed = FALSE; g.themeroom_failed = FALSE;
lua_getglobal(themes, "themerooms_generate"); lua_getglobal(themes, "themerooms_generate");
if ( nhl_pcall(themes, 0, 0)){ if (nhl_pcall(themes, 0, 0)) {
impossible("Lua error: %s", lua_tostring(themes, -1)); impossible("Lua error: %s", lua_tostring(themes, -1));
} }
iflags.in_lua = g.in_mk_themerooms = FALSE; iflags.in_lua = g.in_mk_themerooms = FALSE;
@@ -949,7 +949,7 @@ makelevel(void)
if (check_room(&g.vault_x, &w, &g.vault_y, &h, TRUE)) { if (check_room(&g.vault_x, &w, &g.vault_y, &h, TRUE)) {
fill_vault: fill_vault:
add_room(g.vault_x, g.vault_y, g.vault_x + w, g.vault_y + h, add_room(g.vault_x, g.vault_y, g.vault_x + w, g.vault_y + h,
TRUE, VAULT, FALSE); TRUE, VAULT, FALSE);
g.level.flags.has_vault = 1; g.level.flags.has_vault = 1;
++room_threshold; ++room_threshold;
g.rooms[g.nroom - 1].needfill = FILL_NORMAL; g.rooms[g.nroom - 1].needfill = FILL_NORMAL;