From: MirceaKitsune Date: Mon, 6 Sep 2010 00:51:00 +0000 (+0300) Subject: Some changed to the menu, including a checkbox for the new stomach model option X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9adfa8a7b0ceb2f93b67aeab9bab516ef33dc43;p=voretournament%2Fvoretournament.git Some changed to the menu, including a checkbox for the new stomach model option --- diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c index 8859db9f..791b6490 100644 --- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c +++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c @@ -78,11 +78,14 @@ void fillVoretPlayerSettingsTab(entity me) me.TD(me, 1, 0.3, e = makeVoretButton(">>", '0 0 0')); e.onClick = PlayerModelSelector_Next_Click; e.onClickEntity = pms; - me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Camera type:")); me.TD(me, 1, 1, e = makeVoretRadioButton(1, "chase_active", "0", "1st person")); me.TD(me, 1, 1, e = makeVoretRadioButton(1, "chase_active", "1", "3rd person")); + 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.TR(me); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Field of View:")); me.TD(me, 1, 2, e = makeVoretSlider(60, 130, 1, "fov")); diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c index 449887a5..8cb99474 100644 --- a/data/qcsrc/menu/voret/dialog_settings_effects.c +++ b/data/qcsrc/menu/voret/dialog_settings_effects.c @@ -155,6 +155,9 @@ void fillVoretEffectsSettingsTab(entity me) setDependentWeird(e, someShadowCvarIsEnabled); me.TR(me); me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_coronas", "Coronas")); + me.TDempty(me, 0.2); + me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_coronas_occlusionquery", "Use Occlusion Queries")); + setDependent(e, "r_coronas", 1, 1); me.TR(me); me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_bloom", "Bloom")); setDependent(e, "r_hdr", 0, 0); diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c index 2fb89657..aa1ee53f 100644 --- a/data/qcsrc/menu/voret/dialog_settings_video.c +++ b/data/qcsrc/menu/voret/dialog_settings_video.c @@ -52,8 +52,6 @@ void fillVoretVideoSettingsTab(entity me) me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeVoretCheckBox(0, "vid_gl20", "Use OpenGL 2.0 shaders (GLSL)")); - me.TR(me); - me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_coronas_occlusionquery", "Use Occlusion Queries")); me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeVoretTextLabel(0, "Vertex Buffer Objects (VBOs)"));