xrGame: option -nointro now skip intro video

OpenXRay · Nov 6, 2018 · e9a54c6 · e9a54c6
1 parent 8b2a7fa
commit e9a54c6
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/xrGame/GamePersistent.cpp b/src/xrGame/GamePersistent.cpp
@@ -485,16 +485,25 @@ bool allow_intro()
 #else // #ifdef MASTER_GOLD
     if ((0 != strstr(Core.Params, "-nointro")) || g_SASH.IsRunning())
 #endif // #ifdef MASTER_GOLD
+#else
+    if (0 != strstr(Core.Params, "-nointro"))
+#endif
     {
         return false;
     }
     else
-#endif
         return true;
 }
 
 void CGamePersistent::start_logo_intro()
 {
+    if(!allow_intro()) // TODO this is dirty hack, rewrite!
+    {
+        m_intro_event = 0;
+        Console->Execute("main_menu on");
+        return;
+    }
+
     if (Device.dwPrecacheFrame == 0)
     {
         m_intro_event.bind(this, &CGamePersistent::update_logo_intro);