teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge remote-tracking branch 'blunted2night/loading_screen_fix'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-01-04 10:50:59 +01:00
commit fbb59302d9
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwgui/loadingscreen.cpp
View file

@ -213,7 +213,9 @@ namespace MWGui
void LoadingScreen::changeWallpaper () void LoadingScreen::changeWallpaper ()
{ {
std::vector<std::string> splash; if (mResources.isNull ())
{
mResources = Ogre::StringVectorPtr (new Ogre::StringVector);
Ogre::StringVectorPtr resources = Ogre::ResourceGroupManager::getSingleton ().listResourceNames ("General", false); Ogre::StringVectorPtr resources = Ogre::ResourceGroupManager::getSingleton ().listResourceNames ("General", false);
for (Ogre::StringVector::const_iterator it = resources->begin(); it != resources->end(); ++it) for (Ogre::StringVector::const_iterator it = resources->begin(); it != resources->end(); ++it)
@ -224,11 +226,13 @@ namespace MWGui
boost::to_lower(start); boost::to_lower(start);
if (start == "splash") if (start == "splash")
splash.push_back (*it); mResources->push_back (*it);
} }
if (splash.size()) }
if (mResources->size())
{ {
std::string randomSplash = splash[rand() % splash.size()]; std::string randomSplash = mResources->at (rand() % mResources->size());
Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton ().load (randomSplash, "General"); Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton ().load (randomSplash, "General");
mBackgroundImage->setImageTexture (randomSplash); mBackgroundImage->setImageTexture (randomSplash);

1
apps/openmw/mwgui/loadingscreen.hpp
View file

@ -42,6 +42,7 @@ namespace MWGui
Ogre::Rectangle2D* mRectangle; Ogre::Rectangle2D* mRectangle;
Ogre::MaterialPtr mBackgroundMaterial; Ogre::MaterialPtr mBackgroundMaterial;
Ogre::StringVectorPtr mResources;
bool mLoadingOn; bool mLoadingOn;