remove and transfer INVISIBLE_OBJECTS to branch

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

View File

@@ -94,11 +94,7 @@ struct obj {
Bitfield(recharged,3); /* number of times it's been recharged */
#define on_ice recharged /* corpse on ice */
Bitfield(lamplit,1); /* a light-source -- can be lit */
#ifdef INVISIBLE_OBJECTS
Bitfield(oinvis,1); /* invisible */
#else
Bitfield(oreserved1,1);
#endif
Bitfield(oreserved1,1); /* was the placeholder for invisible objects, free for use */
Bitfield(greased,1); /* covered with grease */
Bitfield(nomerge,1); /* set temporarily to prevent merging */
Bitfield(was_thrown,1); /* thrown by hero since last picked up */