mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-22 16:02:50 +02:00
Code Issues Projects Releases Wiki Activity

- play intro music as soon as possible

Browse Source
This commit is contained in:
Mark Vejvoda
2012-07-27 19:22:57 +00:00
parent 0309e83791
commit 61256fe999
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/main/intro.cpp
View File

@@ -93,6 +93,14 @@ Intro::Intro(Program *program):
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
CoreData &coreData= CoreData::getInstance(); CoreData &coreData= CoreData::getInstance();
SoundRenderer &soundRenderer= SoundRenderer::getInstance();
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false &&
(Shared::Graphics::VideoPlayer::hasBackEndVideoPlayer() == false ||
CoreData::getInstance().hasIntroVideoFilename() == false)) {
soundRenderer.playMusic(CoreData::getInstance().getIntroMusic());
}
const Metrics &metrics= Metrics::getInstance(); const Metrics &metrics= Metrics::getInstance();
int w= metrics.getVirtualW(); int w= metrics.getVirtualW();
int h= metrics.getVirtualH(); int h= metrics.getVirtualH();
@@ -489,8 +497,6 @@ Intro::Intro(Program *program):
//md5Test = Shared::Graphics::md5::getMD5ObjectFromLoaderScript("/home/softcoder/Code/megaglest/trunk/mk/linux/mydata/test/mv1/mv1.loader"); //md5Test = Shared::Graphics::md5::getMD5ObjectFromLoaderScript("/home/softcoder/Code/megaglest/trunk/mk/linux/mydata/test/mv1/mv1.loader");
//md5Test = Shared::Graphics::md5::getMD5ObjectFromLoaderScript("/home/softcoder/Code/megaglest/trunk/mk/linux/mydata/test/mv1/mv2.loader"); //md5Test = Shared::Graphics::md5::getMD5ObjectFromLoaderScript("/home/softcoder/Code/megaglest/trunk/mk/linux/mydata/test/mv1/mv2.loader");
SoundRenderer &soundRenderer= SoundRenderer::getInstance();
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false && if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false &&
@@ -527,8 +533,6 @@ Intro::Intro(Program *program):
return; return;
} }
soundRenderer.playMusic(CoreData::getInstance().getIntroMusic());
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
} }