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

Revert "Fix align type mixup wth align mask"

Browse Source 
This reverts commit 2f4f7d22d3
for now while the matter is investigated further.

Also closes #459
This commit is contained in:
nhmall
2021-02-06 14:54:54 -05:00
parent d817564a6a
commit 4e35e8b5a6
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/extern.h
View File

@@ -621,7 +621,7 @@ extern void find_hell(d_level *);
extern void goto_hell(boolean, boolean); extern void goto_hell(boolean, boolean);
extern void assign_level(d_level *, d_level *); extern void assign_level(d_level *, d_level *);
extern void assign_rnd_level(d_level *, d_level *, int); extern void assign_rnd_level(d_level *, d_level *, int);
extern unsigned int induced_align(int); extern int induced_align(int);
extern boolean Invocation_lev(d_level *); extern boolean Invocation_lev(d_level *);
extern xchar level_difficulty(void); extern xchar level_difficulty(void);
extern schar lev_by_name(const char *); extern schar lev_by_name(const char *);

3
src/dungeon.c
View File

@@ -1869,8 +1869,7 @@ assign_rnd_level(d_level *dest, d_level *src, int range)
dest->dlevel = 1; dest->dlevel = 1;
} }
/* return an alignment mask */ int
unsigned int
induced_align(int pct) induced_align(int pct)
{ {
s_level *lev = Is_special(&u.uz); s_level *lev = Is_special(&u.uz);

8
src/sp_lev.c
View File

@@ -1764,7 +1764,7 @@ create_monster(monster* m, struct mkroom* croom)
struct monst *mtmp; struct monst *mtmp;
xchar x, y; xchar x, y;
char class; char class;
unsigned int amask; aligntyp amask;
coord cc; coord cc;
struct permonst *pm; struct permonst *pm;
unsigned g_mvflags; unsigned g_mvflags;
@@ -1783,7 +1783,7 @@ create_monster(monster* m, struct mkroom* croom)
? Align2amask(noncoalignment(u.ualignbase[A_ORIGINAL])) ? Align2amask(noncoalignment(u.ualignbase[A_ORIGINAL]))
: (m->align == AM_SPLEV_RANDOM) : (m->align == AM_SPLEV_RANDOM)
? induced_align(80) ? induced_align(80)
: Align2amask(m->align); : m->align;
if (!class) if (!class)
pm = (struct permonst *) 0; pm = (struct permonst *) 0;
@@ -2261,7 +2261,7 @@ create_altar(altar* a, struct mkroom* croom)
{ {
schar sproom; schar sproom;
xchar x = -1, y = -1; xchar x = -1, y = -1;
unsigned int amask; aligntyp amask;
boolean croom_is_temple = TRUE; boolean croom_is_temple = TRUE;
int oldtyp; int oldtyp;
@@ -2295,7 +2295,7 @@ create_altar(altar* a, struct mkroom* croom)
? Align2amask(noncoalignment(u.ualignbase[A_ORIGINAL])) ? Align2amask(noncoalignment(u.ualignbase[A_ORIGINAL]))
: (a->align == AM_SPLEV_RANDOM) : (a->align == AM_SPLEV_RANDOM)
? induced_align(80) ? induced_align(80)
: Align2amask(a->align); : a->align;
levl[x][y].typ = ALTAR; levl[x][y].typ = ALTAR;
levl[x][y].altarmask = amask; levl[x][y].altarmask = amask;