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

- bugfixes for playing videos in main menu

Browse Source
This commit is contained in:
Mark Vejvoda
2012-05-19 08:48:30 +00:00
parent 0d38e2eb5d
commit b7ba6e52d5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -535,8 +535,8 @@ Intro::~Intro() {
void Intro::update() { void Intro::update() {
if(exitAfterIntroVideo == true) { if(exitAfterIntroVideo == true) {
//mouseUpLeft(0, 0); mouseUpLeft(0, 0);
cleanup(); //cleanup();
return; return;
} }
timer++; timer++;

7
source/glest_game/menu/main_menu.cpp
View File

@@ -96,7 +96,8 @@ void MainMenu::init() {
Renderer::getInstance().initMenu(this); Renderer::getInstance().initMenu(this);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false && if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false &&
Shared::Graphics::VideoPlayer::hasBackEndVideoPlayer() == true) { Shared::Graphics::VideoPlayer::hasBackEndVideoPlayer() == true &&
CoreData::getInstance().hasMainMenuVideoFilename() == true) {
string introVideoFile = CoreData::getInstance().getMainMenuVideoFilename(); string introVideoFile = CoreData::getInstance().getMainMenuVideoFilename();
if(introVideoFile != "" && fileExists(introVideoFile)) { if(introVideoFile != "" && fileExists(introVideoFile)) {
Context *c= GraphicsInterface::getInstance().getCurrentContext(); Context *c= GraphicsInterface::getInstance().getCurrentContext();
@@ -159,11 +160,11 @@ void MainMenu::render() {
//syncronus update //syncronus update
void MainMenu::update(){ void MainMenu::update(){
if(menuBackgroundVideo != NULL) { if(menuBackgroundVideo == NULL) {
Renderer::getInstance().updateParticleManager(rsMenu); Renderer::getInstance().updateParticleManager(rsMenu);
} }
mouse2dAnim= (mouse2dAnim +1) % Renderer::maxMouse2dAnim; mouse2dAnim= (mouse2dAnim +1) % Renderer::maxMouse2dAnim;
if(menuBackgroundVideo != NULL) { if(menuBackgroundVideo == NULL) {
menuBackground.update(); menuBackground.update();
} }
state->update(); state->update();