From 26e77ccaed5368f69fda6669fd5cef946f7e17eb Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 12 Oct 2013 19:08:49 +0200 Subject: [PATCH] kill more 640x480 hacks --- qcsrc/menu/menu.qc | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index eb68729ba..433b84277 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -17,7 +17,7 @@ float menuNotTheFirstFrame; float menuMouseMode; float conwidth_s, conheight_s, vidwidth_s, vidheight_s, vidpixelheight_s, - realconwidth, realconheight, screenconwidth, screenconheight; + realconwidth, realconheight; void m_sync() { @@ -94,11 +94,10 @@ void m_init() } const float MENU_ASPECT = 1.25; // 1280x1024 -const float MENU_MINHEIGHT = 600; void draw_reset_cropped() { - draw_reset(screenconwidth, screenconheight, 0.5 * (realconwidth - screenconwidth), 0.5 * (realconheight - screenconheight)); + draw_reset(conwidth, conheight, 0.5 * (realconwidth - conwidth), 0.5 * (realconheight - conheight)); } void draw_reset_full() { @@ -130,18 +129,6 @@ void UpdateConWidthHeight(float w, float h, float p) conwidth = realconwidth; conheight = realconwidth / MENU_ASPECT; } - screenconwidth = conwidth; - screenconheight = conheight; - if(conwidth < MENU_MINHEIGHT * MENU_ASPECT) - { - conheight *= MENU_MINHEIGHT * MENU_ASPECT / conwidth; - conwidth = MENU_MINHEIGHT * MENU_ASPECT; - } - if(conheight < MENU_MINHEIGHT) - { - conwidth *= MENU_MINHEIGHT / conheight; - conheight = MENU_MINHEIGHT; - } if(main) { if(conwidth_s != conwidth || conheight_s != conheight) -- 2.39.2