r3128 - trunk/data/qcsrc/menu-div0test/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-11 17:14:45 -0500 (Fri, 11 Jan 2008)
New Revision: 3128

Modified:
   trunk/data/qcsrc/menu-div0test/nexuiz/slider_resolution.c
Log:
handle vid_conwidth and vid_conheight in resolution slider to avoid REALLY bad sizes


Modified: trunk/data/qcsrc/menu-div0test/nexuiz/slider_resolution.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/slider_resolution.c	2008-01-11 22:09:18 UTC (rev 3127)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/slider_resolution.c	2008-01-11 22:14:45 UTC (rev 3128)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(NexuizResolutionSlider) EXTENDS(NexuizTextSlider)
 	METHOD(NexuizResolutionSlider, configureNexuizResolutionSlider, void(entity))
-	METHOD(NexuizResolutionSlider, addResolution, void(entity, float, float))
+	METHOD(NexuizResolutionSlider, addResolution, void(entity, float, float, float, float))
 	METHOD(NexuizResolutionSlider, loadCvars, void(entity))
 	METHOD(NexuizResolutionSlider, saveCvars, void(entity))
 ENDCLASS(NexuizResolutionSlider)
@@ -16,27 +16,27 @@
 	me.configureNexuizResolutionSlider(me);
 	return me;
 }
-void addResolutionNexuizResolutionSlider(entity me, float w, float h)
+void addResolutionNexuizResolutionSlider(entity me, float w, float h, float cw, float ch)
 {
-	me.addValue(me, strzone(strcat(ftos(w), "x", ftos(h))), strzone(strcat(ftos(w), " ", ftos(h))));
+	me.addValue(me, strzone(strcat(ftos(w), "x", ftos(h))), strzone(strcat(ftos(w), " ", ftos(h), " ", ftos(cw), " ", ftos(ch))));
 	// FIXME (in case you ever want to dynamically instantiate this): THIS IS NEVER FREED
 }
 void configureNexuizResolutionSliderNexuizResolutionSlider(entity me)
 {
 	me.configureNexuizTextSlider(me, "vid_width");
-	me.addResolution(me, 640, 480);
-	me.addResolution(me, 800, 600);
-	me.addResolution(me, 1024, 768);
-	me.addResolution(me, 1152, 864);
-	me.addResolution(me, 1280, 800);
-	me.addResolution(me, 1280, 960);
-	me.addResolution(me, 1280, 1024);
-	me.addResolution(me, 1440, 900);
-	me.addResolution(me, 1600, 900);
-	me.addResolution(me, 1600, 1200);
-	me.addResolution(me, 1680, 1050);
-	me.addResolution(me, 1920, 1200);
-	me.addResolution(me, 2048, 1536);
+	me.addResolution(me, 640, 480, 640, 480);
+	me.addResolution(me, 800, 600, 640, 480);
+	me.addResolution(me, 1024, 768, 800, 600);
+	me.addResolution(me, 1152, 864, 800, 600);
+	me.addResolution(me, 1280, 800, 800, 600);
+	me.addResolution(me, 1280, 960, 800, 600);
+	me.addResolution(me, 1280, 1024, 800, 600);
+	me.addResolution(me, 1440, 900, 800, 600);
+	me.addResolution(me, 1600, 900, 800, 600);
+	me.addResolution(me, 1600, 1200, 800, 600);
+	me.addResolution(me, 1680, 1050, 800, 600);
+	me.addResolution(me, 1920, 1200, 800, 600);
+	me.addResolution(me, 2048, 1536, 800, 600);
 	me.configureNexuizTextSliderValues(me);
 }
 void loadCvarsNexuizResolutionSlider(entity me)
@@ -50,6 +50,8 @@
 		tokenize(me.getIdentifier(me));
 		cvar_set("vid_width", argv(0));
 		cvar_set("vid_height", argv(1));
+		cvar_set("vid_conwidth", argv(2));
+		cvar_set("vid_conheight", argv(3));
 	}
 }
 #endif