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

remove and transfer INVISIBLE_OBJECTS to branch

Browse Source
This commit is contained in:
Derek S. Ray
2015-02-17 13:58:27 -05:00
committed by Sean Hunt
parent 5ee52039ca
commit 4dddb97301
15 changed files with 12 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/objnam.c
View File

@@ -683,10 +683,6 @@ register struct obj *obj;
} else
Strcpy(prefix, "a ");
#ifdef INVISIBLE_OBJECTS
if (obj->oinvis) Strcat(prefix,"invisible ");
#endif
/* "empty" goes at the beginning, but item count goes at the end */
if (cknown &&
(Is_container(obj) || obj->otyp == STATUE) && !Has_contents(obj))
@@ -2241,9 +2237,6 @@ struct obj *no_wish;
int cnt, spe, spesgn, typ, very, rechrg;
int blessed, uncursed, iscursed, ispoisoned, isgreased;
int eroded, eroded2, erodeproof;
#ifdef INVISIBLE_OBJECTS
int isinvisible;
#endif
int halfeaten, mntmp, contents;
int islit, unlabeled, ishistoric, isdiluted, trapped;
int tmp, tinv, tvariety;
@@ -2271,9 +2264,6 @@ struct obj *no_wish;
cnt = spe = spesgn = typ = very = rechrg =
blessed = uncursed = iscursed =
#ifdef INVISIBLE_OBJECTS
isinvisible =
#endif
ispoisoned = isgreased = eroded = eroded2 = erodeproof =
halfeaten = islit = unlabeled = ishistoric = isdiluted =
trapped = 0;
@@ -2324,10 +2314,6 @@ struct obj *no_wish;
iscursed = 1;
} else if (!strncmpi(bp, "uncursed ", l=9)) {
uncursed = 1;
#ifdef INVISIBLE_OBJECTS
} else if (!strncmpi(bp, "invisible ", l=10)) {
isinvisible = 1;
#endif
} else if (!strncmpi(bp, "rustproof ", l=10) ||
!strncmpi(bp, "erodeproof ", l=11) ||
!strncmpi(bp, "corrodeproof ", l=13) ||
@@ -3137,10 +3123,6 @@ typfnd:
curse(otmp);
}
#ifdef INVISIBLE_OBJECTS
if (isinvisible) otmp->oinvis = 1;
#endif
/* set eroded */
if (is_damageable(otmp) || otmp->otyp == CRYSKNIFE) {
if (eroded && (is_flammable(otmp) || is_rustprone(otmp)))