Make REINCARNATION unconditional.

There is a lot of code affected by this, and Pat Rankin correctly
observes that it would be better to store roguelike as a level flag
rather than just using Is_rogue_level. A note for the future.
This commit is contained in:
Sean Hunt
2015-02-13 23:46:47 -05:00
parent 260f7ea860
commit 1edadd1d48
42 changed files with 38 additions and 273 deletions

View File

@@ -103,9 +103,7 @@ STATIC_DCL void NDECL(view_init);
STATIC_DCL void FDECL(view_from,(int,int,char **,char *,char *,int,
void (*)(int,int,genericptr_t),genericptr_t));
STATIC_DCL void FDECL(get_unused_cs, (char ***,char **,char **));
#ifdef REINCARNATION
STATIC_DCL void FDECL(rogue_vision, (char **,char *,char *));
#endif
/* Macro definitions that I can't find anywhere. */
#define sign(z) ((z) < 0 ? -1 : ((z) ? 1 : 0 ))
@@ -285,7 +283,6 @@ get_unused_cs(rows, rmin, rmax)
}
#ifdef REINCARNATION
/*
* rogue_vision()
*
@@ -349,7 +346,6 @@ rogue_vision(next, rmin, rmax)
}
}
}
#endif /* REINCARNATION */
/*#define EXTEND_SPINE*/ /* possibly better looking wall-angle */
@@ -568,13 +564,9 @@ vision_recalc(control)
/* skip the normal update loop */
goto skip;
}
#ifdef REINCARNATION
else if (Is_rogue_level(&u.uz)) {
} else if (Is_rogue_level(&u.uz)) {
rogue_vision(next_array,next_rmin,next_rmax);
}
#endif
else {
} else {
int has_night_vision = 1; /* hero has night vision */
if (Underwater && !Is_waterlevel(&u.uz)) {