Fix tame soldier being angry
Wizard-mode created tame soldier got angry when another soldier played a bugle.
This commit is contained in:
+3
-1
@@ -164,7 +164,9 @@ awaken_soldiers(struct monst* bugler /* monster that played instrument */)
|
|||||||
if (DEADMONSTER(mtmp))
|
if (DEADMONSTER(mtmp))
|
||||||
continue;
|
continue;
|
||||||
if (is_mercenary(mtmp->data) && mtmp->data != &mons[PM_GUARD]) {
|
if (is_mercenary(mtmp->data) && mtmp->data != &mons[PM_GUARD]) {
|
||||||
mtmp->mpeaceful = mtmp->msleeping = mtmp->mfrozen = 0;
|
if (!mtmp->mtame)
|
||||||
|
mtmp->mpeaceful = 0;
|
||||||
|
mtmp->msleeping = mtmp->mfrozen = 0;
|
||||||
mtmp->mcanmove = 1;
|
mtmp->mcanmove = 1;
|
||||||
mtmp->mstrategy &= ~STRAT_WAITMASK;
|
mtmp->mstrategy &= ~STRAT_WAITMASK;
|
||||||
if (canseemon(mtmp))
|
if (canseemon(mtmp))
|
||||||
|
|||||||
Reference in New Issue
Block a user