From c0578613af3c3be9c268cc51db4387461908c29c Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sun, 10 Mar 2024 16:58:40 +0100 Subject: [PATCH] Remove superfluous members --- apps/openmw/mwsound/regionsoundselector.cpp | 8 +------- apps/openmw/mwsound/regionsoundselector.hpp | 8 -------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/apps/openmw/mwsound/regionsoundselector.cpp b/apps/openmw/mwsound/regionsoundselector.cpp index 89b5526d30..cb2ece7f8f 100644 --- a/apps/openmw/mwsound/regionsoundselector.cpp +++ b/apps/openmw/mwsound/regionsoundselector.cpp @@ -26,14 +26,8 @@ namespace MWSound mTimeToNextEnvSound = mMinTimeBetweenSounds + (mMaxTimeBetweenSounds - mMinTimeBetweenSounds) * a; mTimePassed = 0; - if (mLastRegionName != regionName) - { - mLastRegionName = regionName; - mSumChance = 0; - } - const ESM::Region* const region - = MWBase::Environment::get().getESMStore()->get().search(mLastRegionName); + = MWBase::Environment::get().getESMStore()->get().search(regionName); if (region == nullptr) return {}; diff --git a/apps/openmw/mwsound/regionsoundselector.hpp b/apps/openmw/mwsound/regionsoundselector.hpp index 7a7659f56d..474e1afa06 100644 --- a/apps/openmw/mwsound/regionsoundselector.hpp +++ b/apps/openmw/mwsound/regionsoundselector.hpp @@ -2,12 +2,6 @@ #define GAME_SOUND_REGIONSOUNDSELECTOR_H #include -#include - -namespace MWBase -{ - class World; -} namespace MWSound { @@ -20,8 +14,6 @@ namespace MWSound private: float mTimeToNextEnvSound = 0.0f; - int mSumChance = 0; - ESM::RefId mLastRegionName; float mTimePassed = 0.0; float mMinTimeBetweenSounds; float mMaxTimeBetweenSounds;