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

15
src/files.c
View File

@@ -2752,11 +2752,8 @@ int which_set;
/* matches desired one */
chosen_symset_start = TRUE;
/* these init_*() functions clear symset fields too */
# ifdef REINCARNATION
if (which_set == ROGUESET) init_r_symbols();
else
# endif
if (which_set == PRIMARY) init_l_symbols();
else if (which_set == PRIMARY) init_l_symbols();
}
break;
case 1:
@@ -2808,11 +2805,8 @@ int which_set;
if (chosen_symset_start)
chosen_symset_end = FALSE;
chosen_symset_start = FALSE;
# ifdef REINCARNATION
if (which_set == ROGUESET) init_r_symbols();
else
# endif
if (which_set == PRIMARY) init_l_symbols();
else if (which_set == PRIMARY) init_l_symbols();
}
}
break;
@@ -2822,12 +2816,9 @@ int which_set;
if (chosen_symset_start) {
if (which_set == PRIMARY) {
update_l_symset(symp, val);
}
# ifdef REINCARNATION
else if (which_set == ROGUESET) {
} else if (which_set == ROGUESET) {
update_r_symset(symp, val);
}
# endif
}
}
}