X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_game_model.qc;h=b57d7cae8a8f536a643b67d25c1c7275a61801b6;hb=06a08d0c6b573f2562297147171aff3d990fa42d;hp=32955ba8f18dc6080faeedeba39d56bc917835ce;hpb=ee4a26c239e85351237b7c6b3deebe93fe372a15;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 32955ba8f..b57d7cae8 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
@@ -1,19 +1,10 @@
-#ifndef DIALOG_SETTINGS_GAME_MODEL_H
-#define DIALOG_SETTINGS_GAME_MODEL_H
-#include "tab.qc"
-CLASS(XonoticGameModelSettingsTab, XonoticTab)
-	//METHOD(XonoticGameModelSettingsTab, toString, string(entity))
-	METHOD(XonoticGameModelSettingsTab, fill, void(entity))
-	METHOD(XonoticGameModelSettingsTab, showNotify, void(entity))
-	ATTRIB(XonoticGameModelSettingsTab, title, string, _("Model"))
-	ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticGameModelSettingsTab, rows, float, 13)
-	ATTRIB(XonoticGameModelSettingsTab, columns, float, 5)
-ENDCLASS(XonoticGameModelSettingsTab)
-entity 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);
@@ -59,7 +50,12 @@ 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("cl_forceplayercolors"));
+			e.addValue(e, _("Never"), "0");
+			e.addValue(e, _("In non teamplay modes only"), "1");
+			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"));
@@ -73,4 +69,3 @@ void XonoticGameModelSettingsTab_fill(entity me)
 			e.configureXonoticTextSliderValues(e);
 			setDependent(e, "cl_gentle", 0, 0);
 }
-#endif