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

Fix align type mixup wth align mask

Browse Source 
Fix two cases of missed conversion of an alignment to an align mask.

Change induced_align()'s return type to unsigned int since it returns
an align mask (unsigned), not an align type (signed).
This commit is contained in:
Dean Luick
2021-01-17 14:25:08 -06:00
parent 2c38749cab
commit 2f4f7d22d3
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sp_lev.c
View File

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