mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-12 03:36:32 +00:00
Code Issues Projects Releases Wiki Activity

Removed duplicate functions and moved pause check in weather.cpp

Browse Source
This commit is contained in:
Internecine 2014-10-10 23:29:51 +13:00
parent 782e851eb1
commit 470d375177
4 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
apps/openmw/mwworld/weather.cpp
View File

@ -348,11 +348,6 @@ void WeatherManager::transition(float factor)
mResult.mRainFrequency = current.mRainFrequency;
}
void WeatherManager::update(float duration)
{
this->update(duration, false);
}
void WeatherManager::update(float duration, bool paused)
{
float timePassed = mTimePassed;
@ -488,52 +483,56 @@ void WeatherManager::update(float duration, bool paused)
mRendering->getSkyManager()->secundaDisable();
}
if (mCurrentWeather == "thunderstorm" && mNextWeather == "" && !paused)
if (!paused)
{
if (mThunderFlash > 0)
if (mCurrentWeather == "thunderstorm" && mNextWeather == "")
{
// play the sound after a delay
mThunderSoundDelay -= duration;
if (mThunderSoundDelay <= 0)
{
// pick a random sound
int sound = rand() % 4;
std::string* soundName = NULL;
if (sound == 0) soundName = &mThunderSoundID0;
else if (sound == 1) soundName = &mThunderSoundID1;
else if (sound == 2) soundName = &mThunderSoundID2;
else if (sound == 3) soundName = &mThunderSoundID3;
if (soundName)
MWBase::Environment::get().getSoundManager()->playSound(*soundName, 1.0, 1.0);
mThunderSoundDelay = 1000;
}
mThunderFlash -= duration;
if (mThunderFlash > 0)
mRendering->getSkyManager()->setLightningStrength( mThunderFlash / mThunderThreshold );
{
// play the sound after a delay
mThunderSoundDelay -= duration;
if (mThunderSoundDelay <= 0)
{
// pick a random sound
int sound = rand() % 4;
std::string* soundName = NULL;
if (sound == 0) soundName = &mThunderSoundID0;
else if (sound == 1) soundName = &mThunderSoundID1;
else if (sound == 2) soundName = &mThunderSoundID2;
else if (sound == 3) soundName = &mThunderSoundID3;
if (soundName)
MWBase::Environment::get().getSoundManager()->playSound(*soundName, 1.0, 1.0);
mThunderSoundDelay = 1000;
}
mThunderFlash -= duration;
if (mThunderFlash > 0)
mRendering->getSkyManager()->setLightningStrength( mThunderFlash / mThunderThreshold );
else
{
mThunderChanceNeeded = rand() % 100;
mThunderChance = 0;
mRendering->getSkyManager()->setLightningStrength( 0.f );
}
}
else
{
mThunderChanceNeeded = rand() % 100;
mThunderChance = 0;
mRendering->getSkyManager()->setLightningStrength( 0.f );
// no thunder active
mThunderChance += duration*4; // chance increases by 4 percent every second
if (mThunderChance >= mThunderChanceNeeded)
{
mThunderFlash = mThunderThreshold;
mRendering->getSkyManager()->setLightningStrength( mThunderFlash / mThunderThreshold );
mThunderSoundDelay = 0.25;
}
}
}
else
{
// no thunder active
mThunderChance += duration*4; // chance increases by 4 percent every second
if (mThunderChance >= mThunderChanceNeeded)
{
mThunderFlash = mThunderThreshold;
mRendering->getSkyManager()->setLightningStrength( mThunderFlash / mThunderThreshold );
mThunderSoundDelay = 0.25;
}
}
mRendering->getSkyManager()->setLightningStrength(0.f);
}
else
mRendering->getSkyManager()->setLightningStrength(0.f);
mRendering->setAmbientColour(mResult.mAmbientColor);
mRendering->sunEnable(false);

4
apps/openmw/mwworld/weather.hpp
View File

@ -169,9 +169,9 @@ namespace MWWorld
/**
* Per-frame update
* @param duration
* @param paused
*/
void update(float duration);
void update(float duration, bool paused);
void update(float duration, bool paused = false);
void stopSounds(bool stopAll);

6
apps/openmw/mwworld/worldimp.cpp
View File

@ -2634,12 +2634,6 @@ namespace MWWorld
MWWorld::ActionTeleport action("", closestMarker.getRefData().getPosition());
action.execute(ptr);
}
void World::updateWeather(float duration)
{
// Implement original behavior:
this->updateWeather(duration, false);
}
void World::updateWeather(float duration, bool paused)
{

3
apps/openmw/mwworld/worldimp.hpp
View File

@ -99,8 +99,7 @@ namespace MWWorld
std::string mStartCell;
void updateWeather(float duration);
void updateWeather(float duration, bool paused);
void updateWeather(float duration, bool paused = false);
int getDaysPerMonth (int month) const;
void rotateObjectImp (const Ptr& ptr, Ogre::Vector3 rot, bool adjust);