1.make HudMenu white at default

2.HudMenu starts from GetBorderSize+5 instead of hardcoded 20 now.
hzqst · Sep 6, 2022 · 4a03c56 · 4a03c56
1 parent f6abfc8
commit 4a03c56
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/Plugins/CaptionMod/exportfuncs.cpp b/Plugins/CaptionMod/exportfuncs.cpp
@@ -28,6 +28,7 @@ int m_iIntermission = 0;
 
 void *GameViewport = NULL;
 int *g_iVisibleMouse = NULL;
+void *gHud = NULL;
 
 HWND g_MainWnd = NULL;
 WNDPROC g_MainWndProc = NULL;

diff --git a/Plugins/CaptionMod/message.cpp b/Plugins/CaptionMod/message.cpp
@@ -1977,7 +1977,7 @@ void CHudMenu::Init(void)
 {
 	m_pfnShowMenu = HOOK_MESSAGE(ShowMenu);
 
-	m_bMenuDisplayed = 0;
+	m_bMenuDisplayed = false;
 	m_bitsValidSlots = 0;
 
 	Reset();
@@ -2025,14 +2025,17 @@ int CHudMenu::Draw(void)
 	{
 		if (m_flShutoffTime <= (*cl_time))
 		{
-			m_bMenuDisplayed = 0;
+			m_bMenuDisplayed = false;
 			return 1;
 		}
 	}
 
 	if (g_pViewPort && g_pViewPort->IsScoreBoardVisible())
 		return 1;
 
+	if(!m_bMenuDisplayed)
+		return 1;
+
 	int nlc = 0;
 
 	for (int i = 0; i < MAX_MENU_STRING && m_szMenuString[i] != '\0'; i++)
@@ -2041,10 +2044,11 @@ int CHudMenu::Draw(void)
 			nlc++;
 	}
 
-	menu_x = 20;
+	int border = (gPrivateFuncs.CHud_GetBorderSize && gHud) ? gPrivateFuncs.CHud_GetBorderSize(gHud, 0) : 15;
+	menu_x = border + 5;
 	menu_r = 255;
 	menu_g = 255;
-	menu_b = 20;
+	menu_b = 255;
 	menu_ralign = 0;
 
 	int ScreenWidth, ScreenHeight;
@@ -2117,7 +2121,7 @@ int CHudMenu::Draw(void)
 			case 'R':
 			{
 				menu_ralign = 1;
-				menu_x = ScreenWidth / 2;
+				menu_x = ScreenWidth / 2 - border;
 
 				sptr += 2;
 				break;
@@ -2246,7 +2250,7 @@ bool CHudMenu::SelectMenuItem(int menu_item)
 			gEngfuncs.pfnClientCmd(szbuf);
 		}
 
-		m_bMenuDisplayed = 0;
+		m_bMenuDisplayed = false;
 		return true;
 	}
 

diff --git a/Plugins/CaptionMod/privatefuncs.cpp b/Plugins/CaptionMod/privatefuncs.cpp
@@ -369,6 +369,16 @@ void Client_FillAddress(void)
 
 			g_iVisibleMouse = *(decltype(g_iVisibleMouse) *)(addr + 11);
 		}
+
+#define SC_GETBORDERSIZE_SIG "\xF6\x05\x2A\x2A\x2A\x2A\x20\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8"
+		{
+			auto addr = (PUCHAR)g_pMetaHookAPI->SearchPattern(g_dwClientBase, g_dwClientSize, SC_GETBORDERSIZE_SIG, Sig_Length(SC_GETBORDERSIZE_SIG));
+			Sig_AddrNotFound(CHud_GetBorderSize);
+
+			gHud = *(decltype(gHud) *)(addr + 10);
+			gPrivateFuncs.CHud_GetBorderSize = (decltype(gPrivateFuncs.CHud_GetBorderSize))
+				g_pMetaHookAPI->GetNextCallAddr(addr + Sig_Length(SC_GETBORDERSIZE_SIG) - 1, 1);
+		}
 	}
 
 	if (!strcmp(gEngfuncs.pfnGetGameDirectory(), "cstrike") || !strcmp(gEngfuncs.pfnGetGameDirectory(), "czero") || !strcmp(gEngfuncs.pfnGetGameDirectory(), "czeror"))

diff --git a/Plugins/CaptionMod/privatefuncs.h b/Plugins/CaptionMod/privatefuncs.h
@@ -47,6 +47,7 @@ typedef struct
 	bool (__fastcall *GameViewport_AllowedToPrintText)(void *pthis, int);
 	bool (__fastcall *GameViewport_IsScoreBoardVisible)(void *pthis, int);
 	void (__fastcall *WeaponsResource_SelectSlot)(void *pthis, int, int iSlot, int fAdvance, int iDirection);
+	int (__fastcall *CHud_GetBorderSize)(void *pthis, int);
 	//int(__fastcall *CHud_DrawHudString)(void *pthis, int xpos, int ypos, int iMaxX, char *szIt, int r, int g, int b);
 	//int(__fastcall *DrawHudStringReverse)(void *pthis, int xpos, int ypos, int iMinX, char *szString, int r, int g, int b);
 
@@ -76,6 +77,7 @@ typedef struct
 
 extern void *GameViewport;
 extern int *g_iVisibleMouse;
+extern void *gHud;
 
 extern double *cl_time;
 extern double *cl_oldtime;