From 9a56b87aad70b0aa3b919cc4fad94cf74fa6dcb4 Mon Sep 17 00:00:00 2001 From: DMD Date: Tue, 12 Sep 2017 00:27:57 +0300 Subject: [PATCH] Fixed Bardic Suggestion cancelling Fascinate --- TemplePlus/condition.cpp | 3 ++- tpdata/tpgamefiles.dat | Bin 336076 -> 336078 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/TemplePlus/condition.cpp b/TemplePlus/condition.cpp index a1711a9b7..2d562af9e 100644 --- a/TemplePlus/condition.cpp +++ b/TemplePlus/condition.cpp @@ -306,6 +306,7 @@ class ConditionFunctionReplacement : public TempleFix { replaceFunction(0x100E2560, _ConditionAdd_NumArgs3); replaceFunction(0x100E2590, _ConditionAdd_NumArgs4); replaceFunction(0x100E25C0, InitCondFromCondStructAndArgs); + replaceFunction(0x100ED030, ConditionRemoveCallback); replaceFunction(0x100EABB0, BarbarianRageStatBonus); replaceFunction(0x100EABE0, BarbarianRageSaveBonus); @@ -5153,7 +5154,7 @@ int ClassAbilityCallbacks::BardMusicActionFrame(DispatcherCallbackArgs args){ auto partsysId = args.GetCondArg(5); gameSystems->GetParticleSys().End(partsysId); auto objHnd = args.GetCondArgObjHndl(3); - if (gameSystems->GetObj().IsValidHandle(objHnd)){ + if (gameSystems->GetObj().IsValidHandle(objHnd) && bmType != BM_SUGGESTION){ // make an exception for Suggestion since it shouldn't abort the Fascinate song d20Sys.d20SendSignal(objHnd, DK_SIG_Bardic_Music_Completed, 0,0); } } diff --git a/tpdata/tpgamefiles.dat b/tpdata/tpgamefiles.dat index c9ddeb69656d27aa278c264ea5ee2e1d3f674d5b..dbc73b7dd7077c28825f5fa401088af30feb2ee1 100644 GIT binary patch delta 3941 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 delta 3810 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 j`rH1n>!N7VRt90=JTOvwKLEhBVs