more angry god vs pacifist conduct
Do it properly, using the arguments to xkilled() instead of reversing the conduct counter after the fact. The xkilled() flag value of '1' has been reversed. It used to mean 'display message' but now means 'suppress message' since both of the other flag bits are for suppression. All callers have been updated to specify either XKILL_GIVEMSG or XKILL_NOMSG so the underlying number remains transparent.
This commit is contained in:
@@ -326,6 +326,13 @@ NEARDATA extern coord bhitpos; /* place where throw or zap hits or stops */
|
||||
#define SORTLOOT_INVLET 0x02
|
||||
#define SORTLOOT_LOOT 0x04
|
||||
|
||||
/* flags for xkilled() [note: meaning of first bit used to be reversed,
|
||||
1 to give message and 0 to suppress] */
|
||||
#define XKILL_GIVEMSG 0
|
||||
#define XKILL_NOMSG 1
|
||||
#define XKILL_NOCORPSE 2
|
||||
#define XKILL_NOCONDUCT 4
|
||||
|
||||
/* Macros for messages referring to hands, eyes, feet, etc... */
|
||||
#define ARM 0
|
||||
#define EYE 1
|
||||
|
||||
Reference in New Issue
Block a user