From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 17 Sep 2013 19:39:37 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/desktopfullscreen
X-Git-Tag: xonotic-v0.8.0~315^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94cd32389004162a325b9e08cfb39bbae156eb0e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/desktopfullscreen

Conflicts:
	qcsrc/menu/menu.qc
---

94cd32389004162a325b9e08cfb39bbae156eb0e
diff --cc qcsrc/menu/menu.qc
index 490a40a4d,1afc9f85d..fd4fced57
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@@ -91,10 -91,9 +91,10 @@@ void m_init(
  	}
  }
  
- float MENU_ASPECT = 1.25; // 1280x1024
- float MENU_MINHEIGHT = 600;
+ const float MENU_ASPECT = 1.25; // 1280x1024
+ const float MENU_MINHEIGHT = 600;
 -float conwidth_s, conheight_s, realconwidth, realconheight, screenconwidth, screenconheight;
 +float conwidth_s, conheight_s, vidwidth_s, vidheight_s, realconwidth,
 +      realconheight, screenconwidth, screenconheight;
  void draw_reset_cropped()
  {
  	draw_reset(screenconwidth, screenconheight, 0.5 * (realconwidth - screenconwidth), 0.5 * (realconheight - screenconheight));