Preparations for UI restart (Part III)

Second part: 685e47d

Author: Xottab-DUTY

src/xrEngine/CustomHUD.cpp

@@ -9,11 +9,9 @@ ENGINE_API CCustomHUD* g_hud = NULL;
 CCustomHUD::CCustomHUD()
 {
     g_hud = this;
-    Device.seqResolutionChanged.Add(this);
 }
 
 CCustomHUD::~CCustomHUD()
 {
     g_hud = NULL;
-    Device.seqResolutionChanged.Remove(this);
 }

src/xrEngine/CustomHUD.h

@@ -19,7 +19,8 @@ ENGINE_API extern Flags32 psHUD_Flags;
 
 class IGameObject;
 
-class ENGINE_API CCustomHUD : public FactoryObjectBase, public IEventReceiver, public pureScreenResolutionChanged
+class ENGINE_API CCustomHUD : public FactoryObjectBase, public IEventReceiver,
+                              public CUIResetAndResolutionNotifier
 {
 public:
     CCustomHUD();

src/xrEngine/XR_IOConsole.cpp

@@ -96,7 +96,6 @@ CConsole::CConsole() : m_hShader_back(NULL)
     m_cmd_history_max = cmd_history_max;
     m_disable_tips = false;
     Register_callbacks();
-    Device.seqResolutionChanged.Add(this);
 }
 
 void CConsole::Initialize()
@@ -134,7 +133,6 @@ CConsole::~CConsole()
     xr_delete(m_hShader_back);
     xr_delete(m_editor);
     Destroy();
-    Device.seqResolutionChanged.Remove(this);
 }
 
 void CConsole::Destroy()
@@ -203,7 +201,7 @@ void CConsole::OutFont(LPCSTR text, float& pos_y)
     }
 }
 
-void CConsole::OnScreenResolutionChanged()
+void CConsole::OnUIReset()
 {
     xr_delete(pFont);
     xr_delete(pFont2);

src/xrEngine/XR_IOConsole.h

@@ -50,7 +50,8 @@ struct TipString
     IC bool operator==(shared_str const& tips_text) { return (text == tips_text); }
 };
 
-class ENGINE_API CConsole : public pureRender, public pureFrame, public pureScreenResolutionChanged
+class ENGINE_API CConsole : public pureRender, public pureFrame,
+                            public CUIResetAndResolutionNotifier
 {
 public:
     struct str_pred
@@ -109,7 +110,9 @@ class ENGINE_API CConsole : public pureRender, public pureFrame, public pureScre
 
     virtual void OnRender();
     virtual void OnFrame();
-    virtual void OnScreenResolutionChanged();
+    
+    void OnUIReset() override;
+    
     string64 ConfigFile;
     bool bVisible;
     vecCMD Commands;

src/xrEngine/device.h

@@ -203,6 +203,7 @@ class ENGINE_API CRenderDevice : public CRenderDeviceBase
 
     MessageRegistry<pureFrame> seqFrameMT;
     MessageRegistry<pureDeviceReset> seqDeviceReset;
+    MessageRegistry<pureUIReset> seqUIReset;
     xr_vector<fastdelegate::FastDelegate0<>> seqParallel;
     CSecondVPParams m_SecondViewport; //--#SM+#-- +SecondVP+
 
@@ -347,4 +348,39 @@ class ENGINE_API CLoadScreenRenderer : public pureRender
 };
 extern ENGINE_API CLoadScreenRenderer load_screen_renderer;
 
+class CDeviceResetNotifier : public pureDeviceReset
+{
+public:
+    CDeviceResetNotifier() { Device.seqDeviceReset.Add(this, REG_PRIORITY_NORMAL); }
+    virtual ~CDeviceResetNotifier() { Device.seqDeviceReset.Remove(this); }
+    void OnDeviceReset() override {}
+};
+
+class CUIResetNotifier : public pureUIReset
+{
+public:
+    CUIResetNotifier() { Device.seqUIReset.Add(this, REG_PRIORITY_NORMAL); }
+    virtual ~CUIResetNotifier() { Device.seqUIReset.Remove(this); }
+    void OnUIReset() override {}
+};
+
+class CUIResetAndResolutionNotifier : public pureUIReset, pureScreenResolutionChanged
+{
+public:
+    CUIResetAndResolutionNotifier()
+    {
+        Device.seqUIReset.Add(this, REG_PRIORITY_NORMAL);
+        Device.seqResolutionChanged.Add(this, REG_PRIORITY_NORMAL);
+    }
+
+    virtual ~CUIResetAndResolutionNotifier()
+    {
+        Device.seqUIReset.Remove(this);
+        Device.seqResolutionChanged.Remove(this);
+    }
+
+    void OnUIReset() override {}
+    void OnScreenResolutionChanged() override { OnUIReset(); }
+};
+
 #endif

src/xrEngine/pure.h

@@ -30,6 +30,7 @@ DECLARE_MESSAGE(AppDeactivate);
 DECLARE_MESSAGE(AppStart);
 DECLARE_MESSAGE(AppEnd);
 DECLARE_MESSAGE(DeviceReset);
+DECLARE_MESSAGE(UIReset);
 DECLARE_MESSAGE(ScreenResolutionChanged);
 
 struct MessageObject

src/xrGame/HUDManager.cpp

@@ -227,7 +227,7 @@ void CHUDManager::Load()
     }
 }
 
-void CHUDManager::OnScreenResolutionChanged()
+void CHUDManager::OnUIReset()
 {
     pUIGame->HideShownDialogs();
 

src/xrGame/HUDManager.h

@@ -51,7 +51,8 @@ class CHUDManager : public CCustomHUD
     void SetHitmarkType(LPCSTR tex_name);
     void SetGrenadeMarkType(LPCSTR tex_name);
 
-    virtual void OnScreenResolutionChanged();
+    void OnUIReset() override;
+
     virtual void Load();
     virtual void OnDisconnected();
     virtual void OnConnected();

src/xrGame/MainMenu.cpp

@@ -148,12 +148,10 @@ 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);
@@ -765,8 +763,9 @@ void CMainMenu::OnDeviceReset()
         SetNeedVidRestart();
 }
 
-void CMainMenu::OnScreenResolutionChanged()
+void CMainMenu::OnUIReset()
 {
+    CUIXmlInitBase::InitColorDefs();
     ReadTextureInfo();
     ReloadUI();
 }

src/xrGame/MainMenu.h

@@ -50,7 +50,7 @@ class CMainMenu : public IMainMenu,
                   public CDialogHolder,
                   public CUIWndCallback,
                   public CDeviceResetNotifier,
-                  public pureScreenResolutionChanged
+                  public CUIResetNotifier
 {
     CUIDialogWnd* m_startDialog;
 
@@ -193,7 +193,7 @@ class CMainMenu : public IMainMenu,
     void Hide_CTMS_Dialog();
     void SetNeedVidRestart();
     virtual void OnDeviceReset();
-    void OnScreenResolutionChanged() override;
+    void OnUIReset() override;
     LPCSTR GetGSVer();
 
     bool IsCDKeyIsValid();