From: terencehill <piuntn@gmail.com>
Date: Mon, 20 May 2013 19:03:32 +0000 (+0200)
Subject: HUD_Panel_UpdatePosSize_ForMenu is more correct this way
X-Git-Tag: xonotic-v0.8.0~226^2~1^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e59f15b5647986d0f162c3546e8e881819d286a7;p=xonotic%2Fxonotic-data.pk3dir.git

HUD_Panel_UpdatePosSize_ForMenu is more correct this way
---

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 5bcc15f81..5ff5e398d 100644
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -261,6 +261,7 @@ if(panel_size_x > panel_size_y)\
 		menu_enable_size_x = panel_size_x * (menu_enable_maxsize_y/panel_size_y);\
 		panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size;\
 	}\
+	menu_enable_pos = eX * 0.5 * vid_conwidth - eX * 0.5 * panel_size_x + eY * (vid_conheight - menu_enable_maxsize_y);\
 }\
 else\
 {\
@@ -270,11 +271,8 @@ else\
 		menu_enable_size_y = panel_size_y * (menu_enable_maxsize_x/panel_size_x);\
 		panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size;\
 	}\
-}\
-if(panel_size_x > panel_size_y)\
-	menu_enable_pos = eX * 0.5 * vid_conwidth - eX * 0.5 * panel_size_x + eY * (vid_conheight - menu_enable_maxsize_y);\
-else\
 	menu_enable_pos = eY * 0.5 * vid_conheight - eY * 0.5 * panel_size_y + eX * (vid_conwidth - menu_enable_maxsize_x);\
+}\
 panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * menu_enable_pos;
 
 // Scale the pos and size vectors to absolute coordinates