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

Make REINCARNATION unconditional.

Browse Source 
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
committed by Pasi Kallinen
parent bb647dc33c
commit ffd201495c
42 changed files with 38 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/config.h
View File

@@ -420,7 +420,6 @@ typedef unsigned char uchar;
/* dungeon features */
/* dungeon levels */
#define WALLIFIED_MAZE /* Fancy mazes - Jean-Christophe Collet */
#define REINCARNATION /* Special Rogue-like levels */
/* monsters & objects */
#define SEDUCE /* Succubi/incubi seduction, by KAA, suggested by IM */
/* I/O */

4
include/decl.h
View File

@@ -46,9 +46,7 @@ E NEARDATA int in_doagain;
E struct dgn_topology { /* special dungeon levels for speed */
d_level d_oracle_level;
d_level d_bigroom_level; /* unused */
#ifdef REINCARNATION
d_level d_rogue_level;
#endif
d_level d_medusa_level;
d_level d_stronghold_level;
d_level d_valley_level;
@@ -75,9 +73,7 @@ E struct dgn_topology { /* special dungeon levels for speed */
/* macros for accesing the dungeon levels by their old names */
#define oracle_level (dungeon_topology.d_oracle_level)
#define bigroom_level (dungeon_topology.d_bigroom_level)
#ifdef REINCARNATION
#define rogue_level (dungeon_topology.d_rogue_level)
#endif
#define medusa_level (dungeon_topology.d_medusa_level)
#define stronghold_level (dungeon_topology.d_stronghold_level)
#define valley_level (dungeon_topology.d_valley_level)

2
include/dungeon.h
View File

@@ -232,9 +232,7 @@ typedef struct mapseen {
Bitfield(valley, 1);
Bitfield(msanctum, 1);
Bitfield(ludios, 1);
# ifdef REINCARNATION
Bitfield(roguelevel, 1);
# endif
} flags;
/* custom naming */
char *custom;

6
include/extern.h
View File

@@ -399,9 +399,7 @@ E char *FDECL(distant_monnam, (struct monst *,int,char *));
E const char *NDECL(rndmonnam);
E const char *FDECL(hcolor, (const char *));
E const char *NDECL(rndcolor);
#ifdef REINCARNATION
E const char *NDECL(roguename);
#endif
E struct obj *FDECL(realloc_obj,
(struct obj *, int, genericptr_t, int, const char *));
E char *FDECL(coyotename, (struct monst *,char *));
@@ -519,9 +517,7 @@ E int FDECL(def_char_to_monclass, (CHAR_P));
#if !defined(MAKEDEFS_C) && !defined(LEV_LEX_C)
E void FDECL(switch_symbols, (int));
E void FDECL(assign_graphics, (int));
#ifdef REINCARNATION
E void NDECL(init_r_symbols);
#endif
E void NDECL(init_symbols);
E void NDECL(init_showsyms);
E void NDECL(init_l_symbols);
@@ -702,11 +698,9 @@ E void FDECL(explode_oil, (struct obj *,int,int));
/* ### extralev.c ### */
#ifdef REINCARNATION
E void NDECL(makeroguerooms);
E void FDECL(corr, (int,int));
E void NDECL(makerogueghost);
#endif
/* ### files.c ### */