*** prop.h	Tue Sep 29 20:24:34 1998
--- \net\nethack\code\proph~1.txt	Sun Nov  8 23:25:46 1998
***************
*** 69,84 ****
  #define ACID_RES		59
  #define STONE_RES		60
  #define UNCHANGING		61
  
! #define LAST_PROP		(UNCHANGING)	/* the last property */
  
  
- #if 1
  /*** Where the properties come from ***/
  /* Definitions were moved here from obj.h and you.h */
  struct prop {
  	/*** Properties conveyed by objects ***/
! 	/*unsigned*/ long extrinsic;
  	/* Armor */
  #	define W_ARM        0x00001000L	/* Body armor */
  #	define W_ARMC       0x00002000L	/* Cloak */
--- 69,85 ----
  #define ACID_RES		59
  #define STONE_RES		60
  #define UNCHANGING		61
+ #define PASSES_WALLS	62
+ #define INDIGESTION		63
  
! #define LAST_PROP		(INDIGESTION)	/* the last property */
  
  
  /*** Where the properties come from ***/
  /* Definitions were moved here from obj.h and you.h */
  struct prop {
  	/*** Properties conveyed by objects ***/
! 	long extrinsic;
  	/* Armor */
  #	define W_ARM        0x00001000L	/* Body armor */
  #	define W_ARMC       0x00002000L	/* Cloak */
***************
*** 110,117 ****
  #	define W_BALL       0x00000400L	/* Punishment ball */
  #	define W_CHAIN      0x00000800L	/* Punishment chain */
  
  	/*** Permanent properties, timeouts, and other flags ***/
! 	/*unsigned*/ long intrinsic;
  	/* Timed properties */
  #	define TIMEOUT      0x00000fffL	/* Up to 4095 */
  	/* Permanent properties */
--- 111,122 ----
  #	define W_BALL       0x00000400L	/* Punishment ball */
  #	define W_CHAIN      0x00000800L	/* Punishment chain */
  
+ 	/*** Property is blocked by an object ***/
+ 	long blocked;					/* Same assignments as extrinsic */
+ /*#	define I_BLOCKED    0x80000000L	/* Property is blocked */
+ 
  	/*** Permanent properties, timeouts, and other flags ***/
! 	long intrinsic;
  	/* Timed properties */
  #	define TIMEOUT      0x00000fffL	/* Up to 4095 */
  	/* Permanent properties */
***************
*** 120,131 ****
  #	define INTRINSIC    (FROMOUTSIDE|FROMEXPER)
  	/* Control flags */
  #	define I_SPECIAL    0x40000000L	/* Property is controllable */
- #	define I_BLOCKED    0x80000000L	/* Property is blocked */
  };
  
  
  /*** Definitions for backwards compatibility ***/
! #define p_flgs intrinsic
  #define LEFT_RING	W_RINGL
  #define RIGHT_RING	W_RINGR
  #define LEFT_SIDE	LEFT_RING
--- 125,135 ----
  #	define INTRINSIC    (FROMOUTSIDE|FROMEXPER)
  	/* Control flags */
  #	define I_SPECIAL    0x40000000L	/* Property is controllable */
  };
  
  
  /*** Definitions for backwards compatibility ***/
! /*#define p_flgs intrinsic*/
  #define LEFT_RING	W_RINGL
  #define RIGHT_RING	W_RINGR
  #define LEFT_SIDE	LEFT_RING
***************
*** 141,147 ****
  #define WORN_BLINDF	W_TOOL
  #ifdef TOURIST
  #define WORN_SHIRT	W_ARMU
- #endif
  #endif
  
  
--- 145,150 ----
