mint-arena: Fix loadhud command not applying hud menu hacks

zturtleman · zturtleman · commit 89e27ff66ebc · 2018-10-13T02:35:25.000-05:00
Using loadhud command to reload HUD (instead of vid_restart) resulted
in menu hacks not being applied to fix voice menu and power up area
screen placement for widescreen.
diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
@@ -585,6 +585,7 @@ static void CG_LoadHud_f( void) {
 	}
 
 	CG_LoadMenus(hudSet);
+	CG_HudMenuHacks();
   menuScoreboard = NULL;
 }
 
diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
@@ -1515,6 +1515,7 @@ void CG_UpdateCvars( void );
 int CG_CrosshairPlayer( int localPlayerNum );
 int CG_LastAttacker( int localPlayerNum );
 void CG_LoadMenus(const char *menuFile);
+void CG_HudMenuHacks( void );
 void CG_DistributeKeyEvent( int key, qboolean down, unsigned time, connstate_t state, int joystickNum, int axisNum );
 void CG_DistributeCharEvent( int key, connstate_t state );
 void CG_KeyEvent(int key, qboolean down);
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
@@ -2447,7 +2447,6 @@ CG_LoadHudMenu();
 void CG_LoadHudMenu( void ) {
 	char buff[1024];
 	const char *hudSet;
-	menuDef_t *menu;
 
 	cgDC.registerShaderNoMip = &trap_R_RegisterShaderNoMip;
 	cgDC.setColor = &trap_R_SetColor;
@@ -2514,6 +2513,18 @@ void CG_LoadHudMenu( void ) {
 	}
 
 	CG_LoadMenus(hudSet);
+	CG_HudMenuHacks();
+}
+
+/*
+=================
+CG_HudMenuHacks
+=================
+*/
+void CG_HudMenuHacks( void ) {
+	menuDef_t *menu;
+
+	Init_Display(&cgDC);
 
 	// make voice chat head stick to left side in widescreen
 	menu = Menus_FindByName( "voiceMenu" );

Original file line number	Diff line number	Diff line change
`@@ -585,6 +585,7 @@ static void CG_LoadHud_f( void) {`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`CG_LoadMenus(hudSet);`
	`588`	`+ CG_HudMenuHacks();`
`588`	`589`	`menuScoreboard = NULL;`
`589`	`590`	`}`
`590`	`591`