Workable

ixray-team · Sep 22, 2024 · b876181 · b876181
1 parent 6ece3a4
commit b876181
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 15 deletions.
diff --git a/src/xrEngine/IGame_Menu.h b/src/xrEngine/IGame_Menu.h
@@ -12,4 +12,6 @@ class IMainMenu
 
 	virtual void RegisterPPDraw(CUIWindow*) = 0;
 	virtual void UnregisterPPDraw(CUIWindow*) = 0;
+
+	virtual class CDialogHolder* GetDialogHolder() = 0;
 };
diff --git a/src/xrEngine/IGame_UICustom.h b/src/xrEngine/IGame_UICustom.h
@@ -5,6 +5,7 @@ class IGame_CustomUI
 public:
 	virtual void ShowGameIndicators(bool) = 0;
 	virtual bool GameIndicatorsShown() const = 0;
+	virtual class CDialogHolder* GetDialogHolder() = 0;
 };
 
 extern ENGINE_API IGame_CustomUI* g_pGameCustom;
diff --git a/src/xrEngine/xr_object.h b/src/xrEngine/xr_object.h
@@ -199,7 +199,7 @@ virtual	const IObjectPhysicsCollision	*physics_collision	()					{ return  0; }
 
 	virtual void						On_SetEntity		()	{};
 	virtual void						On_LostEntity		()	{};
-
+	virtual class IInputReceiver*		GetIIR				()	{return nullptr;}
 public:
 	virtual bool						register_schedule	() const {return true;}
 

diff --git a/src/xrGame/Actor.h b/src/xrGame/Actor.h
@@ -761,6 +761,7 @@ virtual	 void	_BCL	HideAllWeapons					( bool v ){ SetWeaponHideState(INV_STATE_B
 
 			void			set_inventory_disabled (bool is_disabled) { m_inventory_disabled = is_disabled; }
 			bool			inventory_disabled () const { return m_inventory_disabled; }
+	virtual IInputReceiver* GetIIR() override { return this; }
 private:
 			void			set_state_box(u32	mstate);
 private:

diff --git a/src/xrGame/MainMenu.h b/src/xrGame/MainMenu.h
@@ -167,11 +167,12 @@ class CMainMenu :
 
 	virtual bool	UseIndicators					()						{return false;}
 
+	virtual CDialogHolder* GetDialogHolder() override { return this; }
 	void			OnDeviceCreate					();
 
 	void			Screenshot						(IRender_interface::ScreenshotMode mode=IRender_interface::SM_NORMAL, LPCSTR name = 0);
-	virtual void	RegisterPPDraw					(CUIWindow* w);
-	virtual void	UnregisterPPDraw				(CUIWindow* w);
+	virtual void	RegisterPPDraw					(CUIWindow* w) override;
+	virtual void	UnregisterPPDraw				(CUIWindow* w) override;
 
 	void			SetErrorDialog					(EErrorDlg ErrDlg);
 	EErrorDlg		GetErrorDialogType				() const { return m_NeedErrDialog; } ;

diff --git a/src/xrGame/UIGameCustom.h b/src/xrGame/UIGameCustom.h
@@ -125,6 +125,7 @@ class CUIGameCustom :
 
 	virtual void		ShowGameIndicators		(bool b) override {m_bShowGameIndicators	= b;};
 	virtual bool		GameIndicatorsShown		() const override {return m_bShowGameIndicators;};
+	virtual CDialogHolder* GetDialogHolder		() { return this; };
 	void				ShowCrosshair			(bool b)			{psHUD_Flags.set			(HUD_CROSSHAIR_RT, b);}
 	bool				CrosshairShown			()					{return !!psHUD_Flags.test	(HUD_CROSSHAIR_RT);}
 

diff --git a/src/xrUI/Widgets/UIDialogHolder.cpp b/src/xrUI/Widgets/UIDialogHolder.cpp
@@ -7,6 +7,7 @@
 #include "../../xrEngine/IGame_UICustom.h"
 #include "../xrEngine/xr_level_controller.h"
 #include "../xrEngine/CustomHud.h"
+#include "../xrEngine/xr_object.h"
 
 dlgItem::dlgItem(CUIWindow* pWnd)
 {
@@ -278,8 +279,7 @@ bool CDialogHolder::IR_UIOnKeyboardPress(int dik)
 		CObject* O = g_pGameLevel->CurrentEntity();
 		if (O)
 		{
-			// FX: Ïðîâåðèòü íà MP â ðåæèìå íàáëþäàòåëÿ, âîçìîæíà ïîð÷à ïàìÿòè
-			IInputReceiver* IR = (IInputReceiver*)(O);
+			IInputReceiver* IR = O->GetIIR();
 			if (IR)
 			{
 				EGameActions action = get_binded_action(dik);
@@ -315,8 +315,7 @@ bool CDialogHolder::IR_UIOnKeyboardRelease(int dik)
 		CObject* O = g_pGameLevel->CurrentEntity();
 		if( O )
 		{
-			// FX: Ïðîâåðèòü íà MP â ðåæèìå íàáëþäàòåëÿ, âîçìîæíà ïîð÷à ïàìÿòè
-			IInputReceiver* IR = (IInputReceiver*)(O);
+			IInputReceiver* IR = O->GetIIR();
 			if (IR)
 				IR->IR_OnKeyboardRelease(get_binded_action(dik));
 			return			(false);
@@ -339,8 +338,7 @@ bool CDialogHolder::IR_UIOnKeyboardHold(int dik)
 		CObject* O = g_pGameLevel->CurrentEntity();
 		if(O)
 		{
-			// FX: Ïðîâåðèòü íà MP â ðåæèìå íàáëþäàòåëÿ, âîçìîæíà ïîð÷à ïàìÿòè
-			IInputReceiver* IR = (IInputReceiver*)(O);
+			IInputReceiver* IR = O->GetIIR();
 			if(IR)
 				IR->IR_OnKeyboardHold(get_binded_action(dik));
 			return		false;
@@ -377,8 +375,7 @@ bool CDialogHolder::IR_UIOnMouseMove(int dx, int dy)
 		CObject* O				= g_pGameLevel->CurrentEntity();
 		if(O)
 		{
-			// FX: Ïðîâåðèòü íà MP â ðåæèìå íàáëþäàòåëÿ, âîçìîæíà ïîð÷à ïàìÿòè
-			IInputReceiver* IR = (IInputReceiver*)(O);
+			IInputReceiver* IR = O->GetIIR();
 			if (IR)
 				IR->IR_OnMouseMove	(dx,dy);
 			return			false;

diff --git a/src/xrUI/Widgets/UIDialogWnd.cpp b/src/xrUI/Widgets/UIDialogWnd.cpp
@@ -51,9 +51,9 @@ bool CUIDialogWnd::IR_process()
 UI_API CDialogHolder* CurrentDialogHolder()
 {
 	if (g_pGamePersistent->m_pMainMenu->IsActive())
-		return (CDialogHolder*)g_pGamePersistent->m_pMainMenu;
-	else
-		return (CDialogHolder*)g_pGameCustom;
+		return g_pGamePersistent->m_pMainMenu->GetDialogHolder();
+
+	return g_pGameCustom->GetDialogHolder();
 }
 
 

diff --git a/src/xrUI/xrUIXmlParser.cpp b/src/xrUI/xrUIXmlParser.cpp
@@ -7,7 +7,7 @@
 
 shared_str CUIXml::correct_file_name	(LPCSTR path, LPCSTR fn)
 {
-#ifdef XRGAME_EXPORTS
+#ifdef XR_UI_EXPORTS
 	if(0==xr_strcmp(path,UI_PATH) || 0==xr_strcmp(path,"UI"))
 	{
 		return UI().get_xml_name(fn);