From: MirceaKitsune Date: Sat, 26 Feb 2011 02:47:27 +0000 (+0200) Subject: Properly fix the menu to use the current settings X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=142ffe15a749603025208a0f5a64c1ae2b2cd7c6;p=voretournament%2Fvoretournament.git Properly fix the menu to use the current settings --- diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c index 6103df41..95033997 100644 --- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c +++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c @@ -85,9 +85,6 @@ void fillVoretPlayerSettingsTab(entity me) me.TR(me); me.TD(me, 1, 2, e = makeVoretCheckBoxEx(1, -1, "cl_vore_stomachmodel", "Stomach model")); setDependent(e, "chase_active", 0, 0); - me.TR(me); - me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.65, 0, "hud_damage", "Screen splashes")); // must match defaults - makeMulti(e, "hud_stomach"); me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Field of View:")); diff --git a/data/qcsrc/menu/voret/dialog_settings.c b/data/qcsrc/menu/voret/dialog_settings.c index dc0595be..feabe67c 100644 --- a/data/qcsrc/menu/voret/dialog_settings.c +++ b/data/qcsrc/menu/voret/dialog_settings.c @@ -4,7 +4,7 @@ CLASS(VoretSettingsDialog) EXTENDS(VoretDialog) ATTRIB(VoretSettingsDialog, title, string, "Settings") ATTRIB(VoretSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS) ATTRIB(VoretSettingsDialog, intendedWidth, float, 0.96) - ATTRIB(VoretSettingsDialog, rows, float, 22) + ATTRIB(VoretSettingsDialog, rows, float, 21) ATTRIB(VoretSettingsDialog, columns, float, 6) ENDCLASS(VoretSettingsDialog) #endif diff --git a/data/qcsrc/menu/voret/dialog_settings_audio.c b/data/qcsrc/menu/voret/dialog_settings_audio.c index 2b057062..5eb38bbe 100644 --- a/data/qcsrc/menu/voret/dialog_settings_audio.c +++ b/data/qcsrc/menu/voret/dialog_settings_audio.c @@ -3,7 +3,7 @@ CLASS(VoretAudioSettingsTab) EXTENDS(VoretTab) METHOD(VoretAudioSettingsTab, fill, void(entity)) ATTRIB(VoretAudioSettingsTab, title, string, "Audio") ATTRIB(VoretAudioSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretAudioSettingsTab, rows, float, 20) + ATTRIB(VoretAudioSettingsTab, rows, float, 19) ATTRIB(VoretAudioSettingsTab, columns, float, 6.5) ENDCLASS(VoretAudioSettingsTab) entity makeVoretAudioSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c index 7de66b0d..f3f493eb 100644 --- a/data/qcsrc/menu/voret/dialog_settings_effects.c +++ b/data/qcsrc/menu/voret/dialog_settings_effects.c @@ -3,7 +3,7 @@ CLASS(VoretEffectsSettingsTab) EXTENDS(VoretTab) METHOD(VoretEffectsSettingsTab, fill, void(entity)) ATTRIB(VoretEffectsSettingsTab, title, string, "Effects") ATTRIB(VoretEffectsSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretEffectsSettingsTab, rows, float, 20) + ATTRIB(VoretEffectsSettingsTab, rows, float, 19) ATTRIB(VoretEffectsSettingsTab, columns, float, 6.5) ENDCLASS(VoretEffectsSettingsTab) entity makeVoretEffectsSettingsTab(); @@ -173,11 +173,9 @@ void fillVoretEffectsSettingsTab(entity me) e.savedValue = 0.5; // default me.TD(me, 1, 2, s); me.TR(me); - me.TD(me, 1, 2, e = makeVoretCheckBox(0, "hud_damage", "Damage & Water blur")); - me.TD(me, 1, 1, e = makeVoretCheckBox(0, "hud_powerup", "Sharpening")); - me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 1, e = makeVoretTextLabel(0, "* damage blur requires 'screen splashes'")); + me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.65, 0, "hud_damage", "Screen splashes & Blur")); // must match defaults + makeMulti(e, "hud_stomach"); + me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_powerup", "Sharpening")); // must match defaults me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeVoretCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY)); diff --git a/data/qcsrc/menu/voret/dialog_settings_input.c b/data/qcsrc/menu/voret/dialog_settings_input.c index a58b613d..a5771b86 100644 --- a/data/qcsrc/menu/voret/dialog_settings_input.c +++ b/data/qcsrc/menu/voret/dialog_settings_input.c @@ -3,7 +3,7 @@ CLASS(VoretInputSettingsTab) EXTENDS(VoretTab) METHOD(VoretInputSettingsTab, fill, void(entity)) ATTRIB(VoretInputSettingsTab, title, string, "Input") ATTRIB(VoretInputSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretInputSettingsTab, rows, float, 20) + ATTRIB(VoretInputSettingsTab, rows, float, 19) ATTRIB(VoretInputSettingsTab, columns, float, 6.5) ENDCLASS(VoretInputSettingsTab) entity makeVoretInputSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_misc.c b/data/qcsrc/menu/voret/dialog_settings_misc.c index 0f646e2b..4e353d16 100644 --- a/data/qcsrc/menu/voret/dialog_settings_misc.c +++ b/data/qcsrc/menu/voret/dialog_settings_misc.c @@ -3,7 +3,7 @@ CLASS(VoretMiscSettingsTab) EXTENDS(VoretTab) METHOD(VoretMiscSettingsTab, fill, void(entity)) ATTRIB(VoretMiscSettingsTab, title, string, "Misc") ATTRIB(VoretMiscSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretMiscSettingsTab, rows, float, 20) + ATTRIB(VoretMiscSettingsTab, rows, float, 19) ATTRIB(VoretMiscSettingsTab, columns, float, 6.5) ENDCLASS(VoretMiscSettingsTab) entity makeVoretMiscSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_network.c b/data/qcsrc/menu/voret/dialog_settings_network.c index 4b76e7cc..d705eb11 100644 --- a/data/qcsrc/menu/voret/dialog_settings_network.c +++ b/data/qcsrc/menu/voret/dialog_settings_network.c @@ -3,7 +3,7 @@ CLASS(VoretNetworkSettingsTab) EXTENDS(VoretTab) METHOD(VoretNetworkSettingsTab, fill, void(entity)) ATTRIB(VoretNetworkSettingsTab, title, string, "Network") ATTRIB(VoretNetworkSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretNetworkSettingsTab, rows, float, 20) + ATTRIB(VoretNetworkSettingsTab, rows, float, 19) ATTRIB(VoretNetworkSettingsTab, columns, float, 6.5) ENDCLASS(VoretNetworkSettingsTab) entity makeVoretNetworkSettingsTab(); diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c index 8a32214e..ede4ff28 100644 --- a/data/qcsrc/menu/voret/dialog_settings_video.c +++ b/data/qcsrc/menu/voret/dialog_settings_video.c @@ -3,7 +3,7 @@ CLASS(VoretVideoSettingsTab) EXTENDS(VoretTab) METHOD(VoretVideoSettingsTab, fill, void(entity)) ATTRIB(VoretVideoSettingsTab, title, string, "Video") ATTRIB(VoretVideoSettingsTab, intendedWidth, float, 0.9) - ATTRIB(VoretVideoSettingsTab, rows, float, 20) + ATTRIB(VoretVideoSettingsTab, rows, float, 19) ATTRIB(VoretVideoSettingsTab, columns, float, 6.5) ATTRIB(VoretVideoSettingsTab, name, string, "videosettings") ENDCLASS(VoretVideoSettingsTab)