The "Sleep" hint will no longer appear on the load screen

digitall · Jun 3, 2018 · 3e334e4 · 3e334e4
1 parent 33ae25a
commit 3e334e4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/xrEngine/device.h b/src/xrEngine/device.h
@@ -332,6 +332,7 @@ class ENGINE_API CLoadScreenRenderer : public pureRender
     void start(bool b_user_input);
     void stop();
     virtual void OnRender();
+    bool IsActive() const { return b_registered; }
 
     bool b_registered;
     bool b_need_user_input;

diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp
@@ -48,6 +48,9 @@ void CActor::IR_OnKeyboardPress(int cmd)
     if (m_input_external_handler && !m_input_external_handler->authorized(cmd))
         return;
 
+    if (load_screen_renderer.IsActive())
+        return;
+
     switch (cmd)
     {
     case kWPN_FIRE:

diff --git a/src/xrGame/ui/UIGameTutorial.cpp b/src/xrGame/ui/UIGameTutorial.cpp
@@ -97,6 +97,10 @@ bool CUISequenceItem::Stop(bool bForce)
 CUISequencer::CUISequencer() { m_flags.zero(); }
 void CUISequencer::Start(LPCSTR tutor_name)
 {
+    // Skip any tutorial except "game_loaded", since we need to show "st_press_any_key" hint
+    if (load_screen_renderer.IsActive() && xr_strcmp(tutor_name, "game_loaded") != 0)
+        return;
+
     VERIFY(m_sequencer_items.size() == 0);
     Device.seqFrame.Add(this, REG_PRIORITY_LOW - 10000);