Changed: #71 Crash when entering rooms (patch provided by Tierry Anthony, thanks!)

This commit is contained in:
kervala 2013-12-14 09:18:51 +01:00
parent 19f7bc931e
commit 291c961776

View file

@ -688,15 +688,13 @@ void updateWeather()
} }
#endif #endif
// FIXME: temporary fix for teleportation crash
// Update new sky // Update new sky
if (ContinentMngr.cur() && !ContinentMngr.cur()->Indoor) if (ContinentMngr.cur() && Driver->getPolygonMode() == UDriver::Filled && Filter3D[FilterSky])
{
if(Driver->getPolygonMode() == UDriver::Filled)
{
if (Filter3D[FilterSky])
{ {
CSky &sky = ContinentMngr.cur()->CurrentSky; CSky &sky = ContinentMngr.cur()->CurrentSky;
if (sky.getScene())
if (!ContinentMngr.cur()->Indoor && sky.getScene())
{ {
s_SkyMode = NewSky; s_SkyMode = NewSky;
sky.getScene()->animate(TimeInSec-FirstTimeInSec); sky.getScene()->animate(TimeInSec-FirstTimeInSec);
@ -708,8 +706,6 @@ void updateWeather()
s_SkyMode = OldSky; s_SkyMode = OldSky;
} }
} }
}
}
} }
// *************************************************************************************************************************** // ***************************************************************************************************************************