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:
@@ -737,7 +737,7 @@ register xchar x, y;
|
||||
that's the result of his actions; gain experience,
|
||||
lose pacifism, take alignment and luck hit, make
|
||||
corpse less likely to remain tame after revival */
|
||||
xkilled(mtmp, 0); /* no "you kill it" message */
|
||||
xkilled(mtmp, XKILL_NOMSG);
|
||||
/* life-saving doesn't ordinarily reset this */
|
||||
if (mtmp->mhp > 0)
|
||||
u.uconduct.killer = save_pacifism;
|
||||
|
||||
Reference in New Issue
Block a user