From 76198745ae88fc40b1a7068a8b5bdcb2f5129da7 Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 26 Dec 2009 20:38:56 +0000 Subject: [PATCH] reintroduce the 640x480 hack as I have found out what it was good for git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8461 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/menu/menu.qc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/menu/menu.qc b/data/qcsrc/menu/menu.qc index fe27a9902..aad1bb05a 100644 --- a/data/qcsrc/menu/menu.qc +++ b/data/qcsrc/menu/menu.qc @@ -41,6 +41,7 @@ void() m_init = } float MENU_ASPECT = 1.25; // 1280x1024 +float MENU_MINHEIGHT = 600; float conwidth_s, conheight_s, realconwidth, realconheight, screenconwidth, screenconheight; void draw_reset_cropped() { @@ -70,18 +71,16 @@ void UpdateConWidthHeight() } screenconwidth = conwidth; screenconheight = conheight; -#if 0 - if(conwidth < 600 * MENU_ASPECT) + if(conwidth < MENU_MINHEIGHT * MENU_ASPECT) { - conheight *= 600 * MENU_ASPECT / conwidth; - conwidth = 600 * MENU_ASPECT; + conheight *= MENU_MINHEIGHT * MENU_ASPECT / conwidth; + conwidth = MENU_MINHEIGHT * MENU_ASPECT; } - if(conheight < 600) + if(conheight < MENU_MINHEIGHT) { - conwidth *= 600 / conheight; - conheight = 600; + conwidth *= MENU_MINHEIGHT / conheight; + conheight = MENU_MINHEIGHT; } -#endif if(main) { if(conwidth_s != conwidth || conheight_s != conheight) -- 2.39.2