From 5023e4bfad28b1a06bb87e993b3a8795b1e048c2 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Sat, 6 May 2023 23:08:40 +0300
Subject: [PATCH] Fix tame soldier being angry

Wizard-mode created tame soldier got angry when another
soldier played a bugle.
---
 src/music.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/music.c b/src/music.c
index a51ee8257..81e0ccaf6 100644
--- a/src/music.c
+++ b/src/music.c
@@ -164,7 +164,9 @@ awaken_soldiers(struct monst* bugler  /* monster that played instrument */)
         if (DEADMONSTER(mtmp))
             continue;
         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->mstrategy &= ~STRAT_WAITMASK;
             if (canseemon(mtmp))