X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_game_model.c;h=c2aedc1f7eaa99d764924864d018896df85fb58c;hb=81a2ea6d51caecebfd69945e447ab48c275a7c80;hp=c16408acbef2bc4344c821eb715d31f03e2c936f;hpb=d5d861641b0c708c3e148a601af553eef82ff9eb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.c b/qcsrc/menu/xonotic/dialog_settings_game_model.c
index c16408acb..c2aedc1f7 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.c
@@ -6,7 +6,7 @@ CLASS(XonoticGameModelSettingsTab) EXTENDS(XonoticTab)
 	ATTRIB(XonoticGameModelSettingsTab, title, string, _("Model"))
 	ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9)
 	ATTRIB(XonoticGameModelSettingsTab, rows, float, 13)
-	ATTRIB(XonoticGameModelSettingsTab, columns, float, 6.2)
+	ATTRIB(XonoticGameModelSettingsTab, columns, float, 5)
 ENDCLASS(XonoticGameModelSettingsTab)
 entity makeXonoticGameModelSettingsTab();
 #endif
@@ -28,7 +28,36 @@ void XonoticGameModelSettingsTab_fill(entity me)
 {
 	entity e;
 	//float i;
+	
+	// Note that this is pretty terrible currently due to the lack of options for this tab...
+	// There is really not many other decent places for these options, additionally
+	// later I would like quite a few more options in this tab.
 
+	me.gotoRC(me, 0, 1); me.setFirstColumn(me, me.currentColumn);
+		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Items")));
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_simple_items", _("Use simple 2D images instead of item models")));
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Unavailable alpha:")));
+		me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.1, "cl_ghost_items"));
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Unavailable color:")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_ghost_items_color"));
+			e.addValue(e, ZCTX(_("GHOITEMS^Black")), "-1 -1 -1");
+			e.addValue(e, ZCTX(_("GHOITEMS^Dark")), "0.1 0.1 0.1");
+			e.addValue(e, ZCTX(_("GHOITEMS^Tinted")), "0.6 0.6 0.6");
+			e.addValue(e, ZCTX(_("GHOITEMS^Normal")), "1 1 1");
+			e.addValue(e, ZCTX(_("GHOITEMS^Blue")), "-1 -1 3");
+			e.configureXonoticTextSliderValues(e);
+			setDependent(e, "cl_ghost_items", 0.001, 1);
+
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Players")));
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayermodels", _("Force player models to mine")));
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayercolors", _("Force player colors to mine")));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Body fading:")));
 		me.TD(me, 1, 2, e = makeXonoticSlider(0, 2, 0.2, "cl_deathglow"));
@@ -41,10 +70,5 @@ void XonoticGameModelSettingsTab_fill(entity me)
 			e.addValue(e, ZCTX(_("GIBS^Lots")), "0");
 			e.configureXonoticTextSliderValues(e);
 			setDependent(e, "cl_gentle", 0, 0);
-	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayermodels", _("Force player models to mine")));
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayercolors", _("Force player colors to mine")));
 }
 #endif