[nexuiz-commits] r7346 - in trunk/data: . qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-05 07:40:03 -0400 (Wed, 05 Aug 2009)
New Revision: 7346

Modified:
   trunk/data/config_update.cfg
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
   trunk/data/qcsrc/menu/nexuiz/slider_resolution.c
Log:
latch vid_con* cvars


Modified: trunk/data/config_update.cfg
===================================================================
--- trunk/data/config_update.cfg	2009-08-05 11:30:05 UTC (rev 7345)
+++ trunk/data/config_update.cfg	2009-08-05 11:40:03 UTC (rev 7346)
@@ -1,3 +1,7 @@
+// load engine's idea of vid_con*
+seta menu_vid_conwidth $vid_conwidth
+seta menu_vid_conheight $vid_conheight
+
 // fix cvar settings of the engine that Nexuiz is not compatible with
 alias _update_generic_r_dynamic_0 "r_dynamic 1; r_shadow_realtime_dlight 1"
 alias _update_generic_r_dynamic_1 ""

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-08-05 11:30:05 UTC (rev 7345)
+++ trunk/data/defaultNexuiz.cfg	2009-08-05 11:40:03 UTC (rev 7346)
@@ -223,6 +223,7 @@
 // 2D resolution 800x600
 vid_conwidth 800
 vid_conheight 600
+// menu_conwidth, menu_conheight are set inside quake.rc
 set sbar_hudselector 1	"0 = old style hud layout, 1 = new nexuiz hud layout, 2 = combined health and armor display"
 set sbar_hud_accuracy 0 "1 = weapon accuracy on HUD"
 set sbar_showcurrentammo 0 "set to 1 to see only the ammo of the current ammo or 0 to see all 4 ammo counts"

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2009-08-05 11:30:05 UTC (rev 7345)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2009-08-05 11:40:03 UTC (rev 7346)
@@ -158,6 +158,6 @@
 			setDependent(e, "r_motionblur", 0, 1);
 	
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));
+		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_conwidth $menu_vid_conwidth; vid_conheight $menu_vid_conheight; vid_restart", COMMANDBUTTON_APPLY));
 }
 #endif

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c	2009-08-05 11:30:05 UTC (rev 7345)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c	2009-08-05 11:40:03 UTC (rev 7346)
@@ -97,6 +97,6 @@
 	me.TR(me);
 
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));
+		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_conwidth $menu_vid_conwidth; vid_conheight $menu_vid_conheight; vid_restart", COMMANDBUTTON_APPLY));
 }
 #endif

Modified: trunk/data/qcsrc/menu/nexuiz/slider_resolution.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/slider_resolution.c	2009-08-05 11:30:05 UTC (rev 7345)
+++ trunk/data/qcsrc/menu/nexuiz/slider_resolution.c	2009-08-05 11:40:03 UTC (rev 7346)
@@ -44,7 +44,7 @@
 }
 void loadCvarsNexuizResolutionSlider(entity me)
 {
-	me.setValueFromIdentifier(me, strcat(cvar_string("vid_width"), " ", cvar_string("vid_height"), " ", cvar_string("vid_conwidth"), " ", cvar_string("vid_conheight")));
+	me.setValueFromIdentifier(me, strcat(cvar_string("vid_width"), " ", cvar_string("vid_height"), " ", cvar_string("menu_vid_conwidth"), " ", cvar_string("menu_vid_conheight")));
 }
 void saveCvarsNexuizResolutionSlider(entity me)
 {
@@ -53,8 +53,8 @@
 		tokenize_console(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));
+		cvar_set("menu_vid_conwidth", argv(2));
+		cvar_set("menu_vid_conheight", argv(3));
 	}
 }
 #endif