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

6
src/invent.c
View File

@@ -2315,9 +2315,6 @@ boolean picked_some;
/* only one object */
if (dfeature) pline1(fbuf);
read_engr_at(u.ux, u.uy); /* Eric Backus */
#ifdef INVISIBLE_OBJECTS
if (otmp->oinvis && !See_invisible) verb = "feel";
#endif
You("%s here %s.", verb, doname(otmp));
iflags.last_msg = PLNMSG_ONE_ITEM_HERE;
if (otmp->otyp == CORPSE) feel_cockatrice(otmp, FALSE);
@@ -2421,9 +2418,6 @@ mergable(otmp, obj) /* returns TRUE if obj & otmp can be merged */
obj->obroken != otmp->obroken ||
obj->otrapped != otmp->otrapped ||
obj->lamplit != otmp->lamplit ||
#ifdef INVISIBLE_OBJECTS
obj->oinvis != otmp->oinvis ||
#endif
obj->greased != otmp->greased ||
obj->oeroded != otmp->oeroded ||
obj->oeroded2 != otmp->oeroded2 ||