xrGame: option -nointro now skip intro video

eagleivg · eagleivg · commit e9a54c6d486b · 2018-11-06T13:27:07.000+03:00
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);

Original file line number	Diff line number	Diff line change
`@@ -485,16 +485,25 @@ bool allow_intro()`
`485`	`485`	`#else // #ifdef MASTER_GOLD`
`486`	`486`	`if ((0 != strstr(Core.Params, "-nointro")) \|\| g_SASH.IsRunning())`
`487`	`487`	`#endif // #ifdef MASTER_GOLD`
	`488`	`+#else`
	`489`	`+ if (0 != strstr(Core.Params, "-nointro"))`
	`490`	`+#endif`
`488`	`491`	`{`
`489`	`492`	`return false;`
`490`	`493`	`}`
`491`	`494`	`else`
`492`		`-#endif`
`493`	`495`	`return true;`
`494`	`496`	`}`
`495`	`497`
`496`	`498`	`void CGamePersistent::start_logo_intro()`
`497`	`499`	`{`
	`500`	`+ if(!allow_intro()) // TODO this is dirty hack, rewrite!`
	`501`	`+ {`
	`502`	`+ m_intro_event = 0;`
	`503`	`+ Console->Execute("main_menu on");`
	`504`	`+ return;`
	`505`	`+ }`
	`506`	`+`
`498`	`507`	`if (Device.dwPrecacheFrame == 0)`
`499`	`508`	`{`
`500`	`509`	`m_intro_event.bind(this, &CGamePersistent::update_logo_intro);`