]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
HUD_Panel_UpdatePosSize_ForMenu is more correct this way
authorterencehill <piuntn@gmail.com>
Mon, 20 May 2013 19:03:32 +0000 (21:03 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 20 May 2013 19:03:32 +0000 (21:03 +0200)
qcsrc/client/hud.qh

index 5bcc15f8141d2bca4b946230d39dcd0d82f10550..5ff5e398d92f4e9849e863ee7d452534ce4b197f 100644 (file)
@@ -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