File tree Expand file tree Collapse file tree 3 files changed +8
-0
lines changed Expand file tree Collapse file tree 3 files changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -332,6 +332,7 @@ class ENGINE_API CLoadScreenRenderer : public pureRender
332332 void start (bool b_user_input);
333333 void stop ();
334334 virtual void OnRender ();
335+ bool IsActive () const { return b_registered; }
335336
336337 bool b_registered;
337338 bool b_need_user_input;
Original file line number Diff line number Diff line change @@ -48,6 +48,9 @@ void CActor::IR_OnKeyboardPress(int cmd)
4848 if (m_input_external_handler && !m_input_external_handler->authorized (cmd))
4949 return ;
5050
51+ if (load_screen_renderer.IsActive ())
52+ return ;
53+
5154 switch (cmd)
5255 {
5356 case kWPN_FIRE :
Original file line number Diff line number Diff line change @@ -97,6 +97,10 @@ bool CUISequenceItem::Stop(bool bForce)
9797CUISequencer::CUISequencer () { m_flags.zero (); }
9898void CUISequencer::Start (LPCSTR tutor_name)
9999{
100+ // Skip any tutorial except "game_loaded", since we need to show "st_press_any_key" hint
101+ if (load_screen_renderer.IsActive () && xr_strcmp (tutor_name, " game_loaded" ) != 0 )
102+ return ;
103+
100104 VERIFY (m_sequencer_items.size () == 0 );
101105 Device.seqFrame .Add (this , REG_PRIORITY_LOW - 10000 );
102106
You can’t perform that action at this time.
0 commit comments