diff --git a/neo/d3xp/menus/MenuHandler_Shell.cpp b/neo/d3xp/menus/MenuHandler_Shell.cpp index 2349458c..45f018fd 100644 --- a/neo/d3xp/menus/MenuHandler_Shell.cpp +++ b/neo/d3xp/menus/MenuHandler_Shell.cpp @@ -330,6 +330,34 @@ bool idMenuHandler_Shell::HandleGuiEvent( const sysEvent_t* sev ) if( showingIntro ) { + // RB: allow to skip intro videos + if( sev->evType == SE_KEY && sev->evValue2 == 1 && ( sev->evValue == K_ESCAPE || sev->evValue == K_JOY9 ) ) + { + if( introGui != NULL && introGui->IsActive() ) + { + gui->StopSound(); + showingIntro = false; + introGui->Activate( false ); + PlaySound( GUI_SOUND_MUSIC ); + + const char* introName = introGui->GetName(); + + if( idStr::Cmp( introName, "swf/roeintro.swf" ) == 0 ) + { + StartGame( 1 ); + } + else if( idStr::Cmp( introName, "swf/leintro.swf" ) == 0 ) + { + StartGame( 2 ); + } + else + { + StartGame( 0 ); + } + } + } + // RB end + return true; } diff --git a/neo/framework/Common.cpp b/neo/framework/Common.cpp index 855cb01b..aba644bd 100644 --- a/neo/framework/Common.cpp +++ b/neo/framework/Common.cpp @@ -1794,7 +1794,7 @@ bool idCommonLocal::ProcessEvent( const sysEvent_t* event ) { if( event->evType == SE_KEY && event->evValue2 == 1 && ( event->evValue == K_ESCAPE || event->evValue == K_JOY9 ) ) { - if( game->CheckInCinematic() == true ) + if( game->CheckInCinematic() ) { game->SkipCinematicScene(); }