mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 20:53:50 +00:00
Code Issues Releases Wiki Activity

Slightly randomize time between environment sounds

Browse source 
We should use the "Minimum Time Between Environmental Sounds" and
"Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't
have them.
This commit is contained in:
Chris Robinson 2013-08-27 16:04:19 -07:00
parent 02df8ab841
commit f216b25be8
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -4,11 +4,10 @@
#include <algorithm> #include <algorithm>
#include <map> #include <map>
#include "../mwworld/esmstore.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/player.hpp" #include "../mwworld/player.hpp"
#include "sound_output.hpp" #include "sound_output.hpp"
@ -475,27 +474,32 @@ namespace MWSound
void SoundManager::updateRegionSound(float duration) void SoundManager::updateRegionSound(float duration)
{ {
MWWorld::Ptr::CellStore *current = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell(); static float sTimeToNextEnvSound = 0.0f;
static int total = 0; static int total = 0;
static std::string regionName = ""; static std::string regionName = "";
static float timePassed = 0.0; static float sTimePassed = 0.0;
MWBase::World *world = MWBase::Environment::get().getWorld();
const MWWorld::Ptr player = world->getPlayer().getPlayer();
const ESM::Cell *cell = player.getCell()->mCell;
//If the region has changed sTimePassed += duration;
timePassed += duration; if(!cell->isExterior() || sTimePassed < sTimeToNextEnvSound)
if(!current->mCell->isExterior() || timePassed < 10)
return; return;
timePassed = 0;
if(regionName != current->mCell->mRegion) float a = std::rand() / (double)RAND_MAX;
// NOTE: We should use the "Minimum Time Between Environmental Sounds" and
// "Maximum Time Between Environmental Sounds" fallback settings here.
sTimeToNextEnvSound = 5.0f*a + 15.0f*(1.0f-a);
sTimePassed = 0;
if(regionName != cell->mRegion)
{ {
regionName = current->mCell->mRegion; regionName = cell->mRegion;
total = 0; total = 0;
} }
const ESM::Region *regn = const ESM::Region *regn = world->getStore().get<ESM::Region>().search(regionName);
MWBase::Environment::get().getWorld()->getStore().get<ESM::Region>().search(regionName); if(regn == NULL)
if (regn == NULL)
return; return;
std::vector<ESM::Region::SoundRef>::const_iterator soundIter; std::vector<ESM::Region::SoundRef>::const_iterator soundIter;