Preparations for UI restart (Part II)

Thanks @SkyLoaderr First part: d47af9c
OpenXRay · Nov 5, 2018 · 685e47d · 685e47d
1 parent b78e70c
commit 685e47d
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 5 deletions.
diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -145,15 +145,18 @@ CMainMenu::CMainMenu()
     }
 
     Device.seqFrame.Add(this, REG_PRIORITY_LOW - 1000);
+    Device.seqResolutionChanged.Add(this);
 }
 
 CMainMenu::~CMainMenu()
 {
+    Device.seqResolutionChanged.Remove(this);
     Device.seqFrame.Remove(this);
+
     xr_delete(g_btnHint);
     xr_delete(g_statHint);
     xr_delete(m_startDialog);
-    g_pGamePersistent->m_pMainMenu = NULL;
+    g_pGamePersistent->m_pMainMenu = nullptr;
 
 #ifdef WINDOWS
     xr_delete(m_account_mngr);
@@ -758,6 +761,12 @@ void CMainMenu::OnDeviceReset()
         SetNeedVidRestart();
 }
 
+void CMainMenu::OnScreenResolutionChanged()
+{
+    ReadTextureInfo();
+    ReloadUI();
+}
+
 // -------------------------------------------------------------------------------------------------
 
 LPCSTR AddHyphens(LPCSTR c)

diff --git a/src/xrGame/MainMenu.h b/src/xrGame/MainMenu.h
@@ -49,7 +49,8 @@ class CMainMenu : public IMainMenu,
                   public pureRender,
                   public CDialogHolder,
                   public CUIWndCallback,
-                  public CDeviceResetNotifier
+                  public CDeviceResetNotifier,
+                  public pureScreenResolutionChanged
 {
     CUIDialogWnd* m_startDialog;
 
@@ -188,6 +189,7 @@ class CMainMenu : public IMainMenu,
     void Hide_CTMS_Dialog();
     void SetNeedVidRestart();
     virtual void OnDeviceReset();
+    void OnScreenResolutionChanged() override;
     LPCSTR GetGSVer();
 
     bool IsCDKeyIsValid();

diff --git a/src/xrGame/UIGameCustom.h b/src/xrGame/UIGameCustom.h
@@ -114,6 +114,7 @@ class CUIGameCustom : public FactoryObjectBase, public CDialogHolder
     void ShowCrosshair(bool show) { psHUD_Flags.set(HUD_CROSSHAIR_RT, show); }
     bool CrosshairShown() { return !!psHUD_Flags.test(HUD_CROSSHAIR_RT); }
     virtual void HideShownDialogs() {}
+    virtual void ReinitDialogs() {}
     StaticDrawableWrapper* AddCustomStatic(const char* id, bool singleInstance);
     StaticDrawableWrapper* GetCustomStatic(const char* id);
     void RemoveCustomStatic(const char* id);

diff --git a/src/xrGame/UIGameSP.cpp b/src/xrGame/UIGameSP.cpp
@@ -45,6 +45,14 @@ void CUIGameSP::HideShownDialogs()
     }
 }
 
+void CUIGameSP::ReinitDialogs()
+{
+    delete_data(TalkMenu);
+    TalkMenu = new CUITalkWnd();
+    delete_data(UIChangeLevelWnd);
+    UIChangeLevelWnd = new CChangeLevelWnd();
+}
+
 void CUIGameSP::SetClGame(game_cl_GameState* g)
 {
     inherited::SetClGame(g);

diff --git a/src/xrGame/UIGameSP.h b/src/xrGame/UIGameSP.h
@@ -35,7 +35,9 @@ class CUIGameSP : public CUIGameCustom
     void ChangeLevel(GameGraph::_GRAPH_ID game_vert_id, u32 level_vert_id, Fvector pos, Fvector ang, Fvector pos2,
         Fvector ang2, bool b, const shared_str& message, bool b_allow_change_level);
 
-    virtual void HideShownDialogs();
+    void HideShownDialogs() override;
+    void ReinitDialogs() override;
+
 #ifdef DEBUG
     virtual void Render();
 #endif

diff --git a/src/xrGame/console_commands.cpp b/src/xrGame/console_commands.cpp
@@ -1325,6 +1325,9 @@ class CCC_UIRestart : public IConsole_Command
 
     void Execute(pcstr /*args*/) override
     {
+        Device.seqResolutionChanged.Process();
+        if (g_pGamePersistent && g_pGameLevel && Level().game)
+            CurrentGameUI()->ReinitDialogs();
     }
 };
 

diff --git a/src/xrUICore/Options/UIOptionsManager.h b/src/xrUICore/Options/UIOptionsManager.h
@@ -21,8 +21,10 @@ class XRUICORE_API CUIOptionsManager
     void DoUIRestart();
     void DoSystemRestart();
 
-    bool NeedSystemRestart() { return 0 != (m_restart_flags & e_system_restart); }
-    bool NeedVidRestart() { return 0 != (m_restart_flags & e_vid_restart); }
+    bool NeedSystemRestart() const { return 0 != (m_restart_flags & e_system_restart); }
+    bool NeedVidRestart() const { return 0 != (m_restart_flags & e_vid_restart); }
+    bool NeedSndRestart() const { return 0 != (m_restart_flags & e_snd_restart); }
+    bool NeedUIRestart() const { return 0 != (m_restart_flags & e_ui_restart); }
     void SendMessage2Group(const shared_str& group, const char* message);
 
     void RegisterItem(CUIOptionsItem* item, const shared_str& group);