From ce043c19cb795f025a3873857cf04efa2e869481 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Wed, 24 Jul 2024 22:44:48 -0500 Subject: [PATCH] Add in missing Beep sound effect for explosive traps. --- Adventures in Lestoria/AdventuresInLestoria.cpp | 4 ++-- .../assets/config/audio/events.txt | 6 ++++++ Adventures in Lestoria/assets/sounds/beep.ogg | Bin 0 -> 6743 bytes 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Adventures in Lestoria/assets/sounds/beep.ogg diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 9b4e7f79..0eaf5219 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -4237,8 +4237,8 @@ void AiL::UpdateMonsters(){ MONSTER_LIST.push_back(std::make_unique(m)); if(MONSTER_LIST.capacity()>prevCapacity)LOG(std::format("WARNING! The monster list has automatically reserved more space and resized to {}! This caused one potential frame where bullet/effect hitlists that stored information on what monsters were hit to potentially be hit a second time or cause monsters that should've been hit to never be hit. Consider starting with a larger default reserved size for MONSTER_LIST if your intention was to have this many monsters!",MONSTER_LIST.capacity())); } - if(aMonsterIsMarkedForDeletion)std::erase_if(MONSTER_LIST,[](const std::unique_ptr&m){ - if(m->markedForDeletion)std::erase_if(lockOnTargets.begin(),lockOnTargets.end(),[&](const std::tuple&markData){return &*std::get<0>(markData)==m;}) //Marked targets may have dangling pointers, remove them before removing the monsters for good. + if(aMonsterIsMarkedForDeletion)std::erase_if(MONSTER_LIST,[&](const std::unique_ptr&m){ + if(m->markedForDeletion)std::erase_if(lockOnTargets,[&](std::tuplemarkData){return std::get<0>(markData)==&*m;}); //Marked targets may have dangling pointers, remove them before removing the monsters for good. return m->markedForDeletion; }); aMonsterIsMarkedForDeletion=false; diff --git a/Adventures in Lestoria/assets/config/audio/events.txt b/Adventures in Lestoria/assets/config/audio/events.txt index 9bbeede9..23345730 100644 --- a/Adventures in Lestoria/assets/config/audio/events.txt +++ b/Adventures in Lestoria/assets/config/audio/events.txt @@ -19,6 +19,12 @@ Events # Specify file names, followed by volume %. Optional min and max pitch adjustment (Defaults are 90%,110%) File[0] = bear_slam.ogg, 70% } + Beep + { + CombatSound = True + # Specify file names, followed by volume %. Optional min and max pitch adjustment (Defaults are 90%,110%) + File[0] = beep.ogg, 100% + } Bomb Explode { CombatSound = True diff --git a/Adventures in Lestoria/assets/sounds/beep.ogg b/Adventures in Lestoria/assets/sounds/beep.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e38b57af9a3f7bf4c19f8122dd7f8d3df83461cd GIT binary patch literal 6743 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 literal 0 HcmV?d00001