mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-20 15:53:54 +00:00
Code Issues Releases Wiki Activity

Better fix, now allows for teleporting to change weather while still paused.

Browse source
This commit is contained in:
Internecine 2014-10-09 19:41:51 +13:00
parent 3dee4c2b0e
commit 782e851eb1
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwworld/weather.cpp
View file

@ -349,6 +349,11 @@ void WeatherManager::transition(float factor)
}
void WeatherManager::update(float duration)
{
this->update(duration, false);
}
void WeatherManager::update(float duration, bool paused)
{
float timePassed = mTimePassed;
mTimePassed = 0;
@ -483,7 +488,7 @@ void WeatherManager::update(float duration)
mRendering->getSkyManager()->secundaDisable();
}
if (mCurrentWeather == "thunderstorm" && mNextWeather == "")
if (mCurrentWeather == "thunderstorm" && mNextWeather == "" && !paused)
{
if (mThunderFlash > 0)
{

1
apps/openmw/mwworld/weather.hpp
View file

@ -171,6 +171,7 @@ namespace MWWorld
* @param duration
*/
void update(float duration);
void update(float duration, bool paused);
void stopSounds(bool stopAll);

14
apps/openmw/mwworld/worldimp.cpp
View file

@ -1489,12 +1489,10 @@ namespace MWWorld
if (mGoToJail && !paused)
goToJail();
updateWeather(duration, paused);
if (!paused)
{
updateWeather(duration);
doPhysics (duration);
}
mWorldScene->update (duration, paused);
@ -2638,14 +2636,20 @@ namespace MWWorld
}
void World::updateWeather(float duration)
{
// Implement original behavior:
this->updateWeather(duration, false);
}
void World::updateWeather(float duration, bool paused)
{
if (mPlayer->wasTeleported())
{
mPlayer->setTeleported(false);
mWeatherManager->switchToNextWeather(true);
}
mWeatherManager->update(duration);
mWeatherManager->update(duration, paused);
}
struct AddDetectedReference

1
apps/openmw/mwworld/worldimp.hpp
View file

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