From 0c4c8f27ed1d7dc59d82a333b5d8a45e40dbd5c9 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 5 Aug 2009 11:40:03 +0000 Subject: [PATCH] latch vid_con* cvars git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7346 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/config_update.cfg | 4 ++++ data/defaultNexuiz.cfg | 1 + data/qcsrc/menu/nexuiz/dialog_settings_effects.c | 2 +- data/qcsrc/menu/nexuiz/dialog_settings_video.c | 2 +- data/qcsrc/menu/nexuiz/slider_resolution.c | 6 +++--- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/data/config_update.cfg b/data/config_update.cfg index 73c8cd0a0..30d33a7c1 100644 --- a/data/config_update.cfg +++ b/data/config_update.cfg @@ -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 "" diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 6db45a680..75a4c661d 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -223,6 +223,7 @@ vid_height 768 // 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" diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c index 17c69530b..2867bef88 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c @@ -158,6 +158,6 @@ void fillNexuizEffectsSettingsTab(entity me) 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 diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_video.c b/data/qcsrc/menu/nexuiz/dialog_settings_video.c index ae9048e69..3fd71ab51 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_video.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_video.c @@ -97,6 +97,6 @@ void fillNexuizVideoSettingsTab(entity me) 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 diff --git a/data/qcsrc/menu/nexuiz/slider_resolution.c b/data/qcsrc/menu/nexuiz/slider_resolution.c index 3fae8920d..960325f9e 100644 --- a/data/qcsrc/menu/nexuiz/slider_resolution.c +++ b/data/qcsrc/menu/nexuiz/slider_resolution.c @@ -44,7 +44,7 @@ void configureNexuizResolutionSliderNexuizResolutionSlider(entity me) } 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 @@ void saveCvarsNexuizResolutionSlider(entity me) 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 -- 2.39.2