From a120c73f9673fa576929033e22fe0de7b0b767d8 Mon Sep 17 00:00:00 2001 From: MontyTRC89 Date: Sun, 15 May 2022 05:53:01 +0200 Subject: [PATCH] Added legacy secrets system --- TombEngine/Game/control/trigger.cpp | 10 ++++++++++ TombEngine/Sound/sound.cpp | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/TombEngine/Game/control/trigger.cpp b/TombEngine/Game/control/trigger.cpp index 6fc51a9be..4017d55f5 100644 --- a/TombEngine/Game/control/trigger.cpp +++ b/TombEngine/Game/control/trigger.cpp @@ -17,6 +17,7 @@ #include "Objects/objectslist.h" #include "Sound/sound.h" #include "Specific/setup.h" +#include using namespace TEN::Effects::Lara; @@ -679,6 +680,15 @@ void TestTriggers(FloorInfo* floor, int x, int y, int z, bool heavy, int heavyFl // TODO: not used for now break; + case TO_SECRET: + if (!(Statistics.Level.Secrets & (1 << value))) + { + PlaySecretTrack(); + Statistics.Level.Secrets |= (1 << value); + Statistics.Game.Secrets++; + } + break; + default: break; } diff --git a/TombEngine/Sound/sound.cpp b/TombEngine/Sound/sound.cpp index b2a5846cd..8f9298360 100644 --- a/TombEngine/Sound/sound.cpp +++ b/TombEngine/Sound/sound.cpp @@ -32,7 +32,7 @@ const std::string TRACKS_PATH = "Audio\\"; std::map SoundTrackMap; std::unordered_map SoundTracks; -int SecretSoundIndex; +int SecretSoundIndex = 5; static int GlobalMusicVolume; static int GlobalFXVolume; @@ -340,7 +340,6 @@ void EnumerateLegacyTracks() } s.Name = result[1]; SoundTracks.insert(std::make_pair(index, s)); - SecretSoundIndex = std::max(SecretSoundIndex, index); } } }