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

lev_by_name() formatting bits

Browse Source 
Formatting became strange when '#ifdef WIZARD' became unconditional
several years ago, then the bitmask testing code itself became a bit
strange when amnesia got changed a couple of years ago.
This commit is contained in:
PatR
2022-08-28 16:57:42 -07:00
parent 11ae37b358
commit 5ef8454771
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dungeon.c
+5 -7
View File
@@ -2026,10 +2026,10 @@ lev_by_name(const char *nam)
if (mseen || slev) { if (mseen || slev) {
idx = ledger_no(&dlev); idx = ledger_no(&dlev);
if (dlev_in_current_branch(dlev) if (dlev_in_current_branch(dlev)
&& (/* either wizard mode or else seen and not forgotten */ /* either wizard mode or else seen and not forgotten;
wizard note: used to be '(flags & (FORGOTTEN|VISITED)) == VISITED'
|| (g.level_info[idx].flags & (VISITED)) back when amnesia could cause levels to be forgotten */
== VISITED)) { && (wizard || (g.level_info[idx].flags & (VISITED)) == VISITED)) {
lev = depth(&dlev); lev = depth(&dlev);
} }
} else { /* not a specific level; try branch names */ } else { /* not a specific level; try branch names */
@@ -2042,9 +2042,7 @@ lev_by_name(const char *nam)
idxtoo = (idx >> 8) & 0x00FF; idxtoo = (idx >> 8) & 0x00FF;
idx &= 0x00FF; idx &= 0x00FF;
/* either wizard mode, or else _both_ sides of branch seen */ /* either wizard mode, or else _both_ sides of branch seen */
if (wizard if (wizard || (((g.level_info[idx].flags & (VISITED)) == VISITED)
|| (((g.level_info[idx].flags & (VISITED))
== VISITED)
&& ((g.level_info[idxtoo].flags & (VISITED)) && ((g.level_info[idxtoo].flags & (VISITED))
== VISITED))) { == VISITED))) {
if (ledger_to_dnum(idxtoo) == u.uz.dnum) if (ledger_to_dnum(idxtoo) == u.uz.dnum)