From: Samual Lenks <samual@xonotic.org>
Date: Tue, 30 Jul 2013 19:26:31 +0000 (-0400)
Subject: I forgot what this commit does because I made the changes 2 days ago
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~154^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0038fbb394b84c6295787e0d119c0746f9704cd4;p=xonotic%2Fxonotic-data.pk3dir.git

I forgot what this commit does because I made the changes 2 days ago
---

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index f00971674..d443e7b3d 100644
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -33,6 +33,7 @@
 #include "xonotic/dialog_settings_video.c"
 #include "xonotic/dialog_settings_effects.c"
 #include "xonotic/dialog_settings_audio.c"
+#include "xonotic/dialog_settings_game.c"
 #include "xonotic/dialog_settings_user.c"
 #include "xonotic/dialog_settings_misc.c"
 #include "xonotic/dialog_multiplayer.c"
diff --git a/qcsrc/menu/xonotic/dialog_settings.c b/qcsrc/menu/xonotic/dialog_settings.c
index 65686db5e..84f9a74cd 100644
--- a/qcsrc/menu/xonotic/dialog_settings.c
+++ b/qcsrc/menu/xonotic/dialog_settings.c
@@ -19,7 +19,7 @@ void XonoticSettingsDialog_fill(entity me)
 		me.TD(me, 1, 2, mc.makeTabButton(mc, _("Effects"), makeXonoticEffectsSettingsTab()));
 		me.TD(me, 1, 2, mc.makeTabButton(mc, _("Audio"),   makeXonoticAudioSettingsTab()));
 	me.TR(me);
-		me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Game"),   makeXonoticInputSettingsTab()));
+		me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Game"),   makeXonoticGameSettingsTab()));
 		me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Input"),   makeXonoticInputSettingsTab()));
 		me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("User"),    makeXonoticUserSettingsTab()));
 		me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Misc"),    makeXonoticMiscSettingsTab()));
diff --git a/qcsrc/menu/xonotic/dialog_settings_game.c b/qcsrc/menu/xonotic/dialog_settings_game.c
new file mode 100644
index 000000000..cbd230928
--- /dev/null
+++ b/qcsrc/menu/xonotic/dialog_settings_game.c
@@ -0,0 +1,79 @@
+#ifdef INTERFACE
+CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab)
+	METHOD(XonoticGameSettingsTab, fill, void(entity))
+	ATTRIB(XonoticGameSettingsTab, title, string, _("Game"))
+	ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9)
+	ATTRIB(XonoticGameSettingsTab, rows, float, 17)
+	ATTRIB(XonoticGameSettingsTab, columns, float, 6)
+ENDCLASS(XonoticGameSettingsTab)
+entity makeXonoticGameSettingsTab();
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeXonoticGameSettingsTab()
+{
+	entity me;
+	me = spawnXonoticGameSettingsTab();
+	me.configureDialog(me);
+	return me;
+}
+
+void XonoticGameSettingsTab_fill(entity me)
+{
+	entity e;
+
+
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", _("Disable gore effects and harsh language"))); // also set sv_gentle
+		
+	me.gotoRC(me, 2, 3); me.setFirstColumn(me, me.currentColumn);
+		me.TDempty(me, 0.5);
+		me.TD(me, 1, 2, e = makeXonoticButton(_("Crosshair"), '0 0 0'));
+			e.onClick = DialogOpenButton_Click;
+			e.onClickEntity = main.crosshairDialog;
+		setDependent(e, "crosshair_enabled", 1, 2);
+		// TODO: show status of crosshair dot and hittest and pickups and such here with text
+	me.TR(me);
+		me.TDempty(me, 0.5);
+		me.TD(me, 1, 2, e = makeXonoticButton(_("HUD"), '0 0 0'));
+			e.onClick = DialogOpenButton_Click;
+			e.onClickEntity = main.hudDialog;
+		// TODO: show hud config name with text here 
+	me.TR(me);
+		me.TDempty(me, 0.5);
+		me.TD(me, 1, 2, e = makeXonoticButton(_("Notification"), '0 0 0'));
+			e.onClick = DialogOpenButton_Click;
+			e.onClickEntity = main.modelDialog;
+		// TODO: show csqc model settings like forcemyplayer and deglowing/ghosting bodies with text here
+	me.TR(me);
+		me.TDempty(me, 0.5);
+		me.TD(me, 1, 2, e = makeXonoticButton(_("Playermodel"), '0 0 0'));
+			e.onClick = DialogOpenButton_Click;
+			e.onClickEntity = main.modelDialog;
+		// TODO: show csqc model settings like forcemyplayer and deglowing/ghosting bodies with text here
+	me.TR(me);
+		me.TDempty(me, 0.5);
+		me.TD(me, 1, 2, e = makeXonoticButton(_("View"), '0 0 0'));
+			e.onClick = DialogOpenButton_Click;
+			e.onClickEntity = main.viewDialog;
+		// TODO: show fov and other settings with text here
+	me.TR(me);
+		me.TDempty(me, 0.5);
+		me.TD(me, 1, 2, e = makeXonoticButton(_("Weapon"), '0 0 0'));
+			e.onClick = DialogOpenButton_Click;
+			e.onClickEntity = main.weaponsDialog;
+		// I don't really think this is useful as is, and especially it doesn't look very clean...
+		// In the future, if ALL of these buttons had some information, then it would be justified/clean
+		//me.TD(me, 1, 1, e0 = makeXonoticTextLabel(0, string_null)); 
+		//	e0.textEntity = main.weaponsDialog;
+		//	e0.allowCut = 1;
+
+	//me.gotoRC(me, me.rows - 1, 0);
+	//	me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "color -1 -1;name \"$_cl_name\";sendcvar cl_weaponpriority;sendcvar cl_autoswitch;sendcvar cl_forceplayermodels;sendcvar cl_forceplayermodelsfromxonotic;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY));
+
+
+
+	me.gotoRC(me, me.rows - 1, 0);
+		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_gentle; sendcvar cl_allow_uidtracking; sendcvar cl_allow_uid2name;", COMMANDBUTTON_APPLY));
+}
+#endif