Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Backed out changeset: 7bdb27443f88

Browse source
This commit is contained in:
kaetemi 2014-07-28 22:15:09 +02:00
parent 12aa02585f
commit 5930d3b384
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
code/ryzom/client/src/main_loop.cpp
View file

@ -688,22 +688,26 @@ void updateWeather()
} }
#endif #endif
// FIXME: temporary fix for teleportation crash
// Update new sky // Update new sky
if (ContinentMngr.cur() && Driver->getPolygonMode() == UDriver::Filled && Filter3D[FilterSky]) if (ContinentMngr.cur() && !ContinentMngr.cur()->Indoor)
{ {
CSky &sky = ContinentMngr.cur()->CurrentSky; if(Driver->getPolygonMode() == UDriver::Filled)
if (!ContinentMngr.cur()->Indoor && sky.getScene())
{ {
s_SkyMode = NewSky; if (Filter3D[FilterSky])
sky.getScene()->animate(TimeInSec-FirstTimeInSec); {
// Setup the sky camera CSky &sky = ContinentMngr.cur()->CurrentSky;
preRenderNewSky(); if (sky.getScene())
} {
else s_SkyMode = NewSky;
{ sky.getScene()->animate(TimeInSec-FirstTimeInSec);
s_SkyMode = OldSky; // Setup the sky camera
preRenderNewSky();
}
else
{
s_SkyMode = OldSky;
}
}
} }
} }
} }