ich777/CorsixTH
1
0
Fork 0
mirror of https://github.com/CorsixTH/CorsixTH.git synced 2025-07-23 04:13:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2892 from Alberth289346/multi-sounds

Browse Source 
Allow one or two sounds to be played with an animation frame
This commit is contained in:
Stephen E. Baker
2025-06-09 12:38:49 -04:00
committed by GitHub
parent 67cffb2847 c759341994
commit 08ddc54b0b
1 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
CorsixTH/Src/th_gfx.cpp
View File

@@ -1466,23 +1466,64 @@ void animation::set_animation_kind(animation_kind anim_kind) {
}
namespace {
//! Storage of one or two sounds. If two sounds are stored, both are selected in
//! 50% of the cases.
struct sound_pair {
sound_pair(int16_t sound) : soundA(sound), soundB(-1) {}
sound_pair(int16_t soundA, int16_t soundB) : soundA(soundA), soundB(soundB) {}
int16_t get_sound() const {
if (soundB < 0) {
return soundA;
} else {
int value = rand();
int counter = 0;
for (int i = 0; i < 7; i++) {
counter = counter + (value & 1);
value >>= 1;
}
return (counter < 4) ? soundA : soundB;
}
}
private:
const int16_t soundA; //!< First available sound.
const int16_t soundB; //!< If non-negative, the second available sound.
};
typedef std::map<size_t, sound_pair> sound_replacement_map;
// Map of frame numbers to sounds to play.
const std::map<size_t, int> frame_sound_replacements{
const sound_replacement_map frame_sound_replacements{
// Female flying to heaven (anim 3220)
{6987, 123},
{6987, sound_pair(123)},
// Using Computer (anim 2098)
{4213, 35},
{4215, 35},
{4224, 35},
{4230, 35},
{4213, sound_pair(35)},
{4215, sound_pair(35)},
{4224, sound_pair(35)},
{4230, sound_pair(35)},
// Vomit sounds.
{1902, sound_pair(58, 114)}, // Animation 1034
{4149, sound_pair(58, 114)}, // Animation 2056
{6901, sound_pair(58, 114)}, // Animation 3184
{8819, sound_pair(58, 114)}, // Animation 4138
{9105, sound_pair(58, 114)}, // Animation 4204
{9565, sound_pair(58, 114)}, // Animation 4324
{9654, sound_pair(58, 114)}, // Animation 4384
{9944, sound_pair(58, 114)}, // Animation 4452
{10007, sound_pair(58, 114)}, // Animation 4476
{10989, sound_pair(58, 114)}, // Animation 4792
// Using Atom Analyser. Actually a generic animation of Researcher pushing
// buttons (anim 4878)
{11136, 35},
{11138, 35},
{11147, 35},
{11152, 35},
{11153, 35},
{11154, 35}};
{11136, sound_pair(35)},
{11138, sound_pair(35)},
{11147, sound_pair(35)},
{11152, sound_pair(35)},
{11153, sound_pair(35)},
{11154, sound_pair(35)}};
} // Namespace
void animation::tick() {
@@ -1501,12 +1542,12 @@ void animation::tick() {
}
// Decide sound to play.
std::map<size_t, int>::const_iterator pos =
sound_replacement_map::const_iterator pos =
frame_sound_replacements.find(frame_index);
if (pos == frame_sound_replacements.end()) {
sound_to_play = manager->get_frame_sound(frame_index);
} else {
sound_to_play = pos->second;
sound_to_play = pos->second.get_sound();
}
}