X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_game_model.qc;h=c63248740b67cc2a3b1d1d4b01223d66da3723c5;hb=99c3e6da047827e29ecd320cc39215ae3a951637;hp=7b0794bdd782e671c84693eb6b60b715dbba2b48;hpb=c51698509e174e343dff48128a1dcfff1527c535;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qc b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
index 7b0794bdd..c63248740 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
@@ -1,20 +1,10 @@
-#ifndef DIALOG_SETTINGS_GAME_MODEL_H
-#define DIALOG_SETTINGS_GAME_MODEL_H
-#include "tab.qc"
-CLASS(XonoticGameModelSettingsTab, XonoticTab)
-	METHOD(XonoticGameModelSettingsTab, fill, void(entity));
-	METHOD(XonoticGameModelSettingsTab, showNotify, void(entity));
-	ATTRIB(XonoticGameModelSettingsTab, title, string, _("Models"))
-	ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticGameModelSettingsTab, rows, float, 13)
-	ATTRIB(XonoticGameModelSettingsTab, columns, float, 5)
-ENDCLASS(XonoticGameModelSettingsTab)
-entity makeXonoticGameModelSettingsTab();
-#include "../gamesettings.qh"
-REGISTER_SETTINGS(Models, makeXonoticGameModelSettingsTab());
-#endif
+#include "dialog_settings_game_model.qh"
+
+#include "textlabel.qh"
+#include "checkbox.qh"
+#include "textslider.qh"
+#include "slider.qh"
 
-#ifdef IMPLEMENTATION
 void XonoticGameModelSettingsTab_showNotify(entity me)
 {
 	loadAllCvars(me);
@@ -60,7 +50,16 @@ void XonoticGameModelSettingsTab_fill(entity 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")));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Force player colors to mine")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider_T("cl_forceplayercolors",
+			_("Warning: if enabled in team games your team's color may be the same as the enemy team")));
+			e.addValue(e, _("Never"), "0");
+			e.addValue(e, _("Except in team games"), "1");
+			e.addValue(e, _("Only in Duel"), "3");
+			e.addValue(e, _("Only in team games"), "4");
+			e.addValue(e, _("In team games and Duel"), "5");
+			e.addValue(e, _("Always"), "2");
+			e.configureXonoticTextSliderValues(e);
 	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"));
@@ -74,4 +73,3 @@ void XonoticGameModelSettingsTab_fill(entity me)
 			e.configureXonoticTextSliderValues(e);
 			setDependent(e, "cl_gentle", 0, 0);
 }
-#endif