Revert "Fix align type mixup wth align mask"

This reverts commit 2f4f7d22d3531c8c07253543b9d8f81637f9356c
for now while the matter is investigated further.

Also closes #459

diff --git a/include/extern.h b/include/extern.h
index a6302da2c25482a72e0bdb7a5d6f404b0d9c2344..25bebb26a0332e7b1386d4d85f78776c947f1dd0 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -621,7 +621,7 @@ extern void find_hell(d_level *);
 extern void goto_hell(boolean, boolean);
 extern void assign_level(d_level *, d_level *);
 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 xchar level_difficulty(void);
 extern schar lev_by_name(const char *);

diff --git a/src/dungeon.c b/src/dungeon.c
index f70dcf6bf5222eec4a5fc9e7533efd975c6daa35..872330d4abd9431cabde66ffd7227cc52eefac58 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1869,8 +1869,7 @@ assign_rnd_level(d_level *dest, d_level *src, int range)
         dest->dlevel = 1;
 }
 
-/* return an alignment mask */
-unsigned int
+int
 induced_align(int pct)
 {
     s_level *lev = Is_special(&u.uz);

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