X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_game_view.qc;h=0b3a9ff6c4402253b2a30fb8ab277ab41b6a3c3d;hb=af43b181a15f348a4de2045b716ebc7765ce8f9f;hp=40b5aebba40e884b9e2f594315121ba7aa7cb21a;hpb=a4594d94df1eb60aca616cccd45df07e561ffa01;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc index 40b5aebba..0b3a9ff6c 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc @@ -1,20 +1,11 @@ -#ifndef DIALOG_SETTINGS_GAME_VIEW_H -#define DIALOG_SETTINGS_GAME_VIEW_H -#include "tab.qc" -CLASS(XonoticGameViewSettingsTab, XonoticTab) - METHOD(XonoticGameViewSettingsTab, fill, void(entity)); - METHOD(XonoticGameViewSettingsTab, showNotify, void(entity)); - ATTRIB(XonoticGameViewSettingsTab, title, string, _("View")) - ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameViewSettingsTab, rows, float, 13) - ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2) -ENDCLASS(XonoticGameViewSettingsTab) -entity makeXonoticGameViewSettingsTab(); -#include "../gamesettings.qh" -REGISTER_SETTINGS(View, makeXonoticGameViewSettingsTab()); -#endif +#include "dialog_settings_game_view.qh" + +#include "textlabel.qh" +#include "checkbox.qh" +#include "textslider.qh" +#include "slider.qh" +#include "radiobutton.qh" -#ifdef IMPLEMENTATION void XonoticGameViewSettingsTab_showNotify(entity me) { loadAllCvars(me); @@ -52,7 +43,7 @@ void XonoticGameViewSettingsTab_fill(entity me) setDependent(e, "chase_active", -1, 0); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.01, 0, "cl_bob", _("View bobbing while walking around"))); + me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx_T(0.01, 0, "cl_bob", _("View bobbing while walking around"), "-")); makeMulti(e, "cl_bob2"); setDependent(e, "chase_active", -1, 0); me.TR(me); @@ -74,11 +65,12 @@ void XonoticGameViewSettingsTab_fill(entity me) me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_clippedspectating", _("Allow passing through walls while spectating"))); + e.sendCvars = true; me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Field of view:"))); me.TD(me, 1, 2, e = makeXonoticSlider_T(60, 130, 5, "fov", - _("Field of vision in degrees from 60 to 130, default is 90"))); + _("Field of vision in degrees"))); me.TR(me); me.TR(me); //me.TDempty(me, 0.2); @@ -122,10 +114,9 @@ void XonoticGameViewSettingsTab_fill(entity me) me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_reticle", _("Display reticle 2D overlay while zooming"))); me.TR(me); //me.TDempty(me, 0.2); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_unpress_zoom_on_death", _("Release zoom when you die or respawn"))); + me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "cl_unpress_zoom_on_death", _("Release zoom when you die or respawn"), "-")); makeMulti(e, "cl_unpress_zoom_on_spawn"); me.TR(me); //me.TDempty(me, 0.2); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_unpress_zoom_on_weapon_switch", _("Release zoom when you switch weapons"))); } -#endif