From f1dcc93365788165f86196900311bafff438ba98 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 6 Jan 2021 08:10:30 +0100 Subject: [PATCH] [hellfire] Fix Bard and Barbarian talking to cows Also fix monk pain sound during Blodboil spell --- Source/missiles.cpp | 2 +- Source/towners.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/missiles.cpp b/Source/missiles.cpp index 83b2968a6..251daf579 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -3290,7 +3290,7 @@ void AddBlodboil(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy PS_WARR70, PS_ROGUE70, PS_MAGE70, - PS_MAGE70, // BUGFIX: PS_MONK70? + PS_MONK70, // BUGFIX: PS_MONK70? (fixed) PS_ROGUE70, PS_WARR70 }; diff --git a/Source/towners.cpp b/Source/towners.cpp index 31eed29c7..c1ca9160d 100644 --- a/Source/towners.cpp +++ b/Source/towners.cpp @@ -25,9 +25,9 @@ TownerStruct towner[NUM_TOWNERS]; * ref: enum plr_class */ const int snSFX[3][NUM_CLASSES] = { - { PS_WARR52, PS_ROGUE52, PS_MAGE52, PS_MONK52, 0 }, // BUGFIX: add warrior sounds for barbarian instead of 0 - walk sound - { PS_WARR49, PS_ROGUE49, PS_MAGE49, PS_MONK49, 0 }, - { PS_WARR50, PS_ROGUE50, PS_MAGE50, PS_MONK50, 0 }, + { PS_WARR52, PS_ROGUE52, PS_MAGE52, PS_MONK52, PS_ROGUE52, PS_WARR52 }, // BUGFIX: add warrior sounds for barbarian instead of 0 - walk sound (fixed) + { PS_WARR49, PS_ROGUE49, PS_MAGE49, PS_MONK49, PS_ROGUE49, PS_WARR49 }, + { PS_WARR50, PS_ROGUE50, PS_MAGE50, PS_MONK50, PS_ROGUE50, PS_WARR50 }, }; /* data */