X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcolorpicker_string.qc;h=200204c00d131cc9fb3e62615215fd74a6577b1f;hb=90da6817bc443ee9402472527e746af2c254926e;hp=458a72c01a6fe1dd47ced6e06c2dffb4ddfe41e3;hpb=cfc1a19f21842b65814c855082b059b22ff0c392;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/colorpicker_string.qc b/qcsrc/menu/xonotic/colorpicker_string.qc
index 458a72c01..200204c00 100644
--- a/qcsrc/menu/xonotic/colorpicker_string.qc
+++ b/qcsrc/menu/xonotic/colorpicker_string.qc
@@ -1,44 +1,23 @@
-#ifdef INTERFACE
-CLASS(XonoticColorpickerString) EXTENDS(Image)
-	METHOD(XonoticColorpickerString, configureXonoticColorpickerString, void(entity, string, string))
-	METHOD(XonoticColorpickerString, mousePress, float(entity, vector))
-	METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector))
-	METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector))
-	ATTRIB(XonoticColorpickerString, cvarName, string, string_null)
-	METHOD(XonoticColorPickerString, loadCvars, void(entity))
-	METHOD(XonoticColorPickerString, saveCvars, void(entity))
-	ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0')
-	ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER)
-	ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER)
-	ATTRIB(XonoticColorpickerString, focusable, float, 1)
-	METHOD(XonoticColorpickerString, draw, void(entity))
-	ATTRIB(XonoticColorpickerString, disabledAlpha, float, 0.3)
-ENDCLASS(XonoticColorpickerString)
-entity makeXonoticColorpickerString(string theCvar, string theDefaultCvar);
-#endif
-
-#ifdef IMPLEMENTATION
+#include "colorpicker_string.qh"
+
+.bool disabled;
+
 entity makeXonoticColorpickerString(string theCvar, string theDefaultCvar)
 {
 	entity me;
-	me = spawnXonoticColorpickerString();
+	me = NEW(XonoticColorpickerString);
 	me.configureXonoticColorpickerString(me, theCvar, theDefaultCvar);
 	return me;
 }
 
 void XonoticColorpickerString_configureXonoticColorpickerString(entity me, string theCvar, string theDefaultCvar)
 {
-	me.cvarName = theCvar;
 	me.configureImage(me, me.image);
-	if(theCvar)
-	{
-		me.cvarName = theCvar;
-		me.tooltip = getZonedTooltipForIdentifier(theCvar);
-		me.loadCvars(me);
-	}
+	me.cvarName = (theCvar) ? theCvar : string_null;
+	me.loadCvars(me);
 }
 
-void XonoticColorPickerString_loadCvars(entity me)
+void XonoticColorpickerString_loadCvars(entity me)
 {
 	if (!me.cvarName)
 		return;
@@ -55,7 +34,7 @@ void XonoticColorPickerString_loadCvars(entity me)
 		me.prevcoords = color_hslimage(stov(cvar_string(me.cvarName)), me.imagemargin);
 }
 
-void XonoticColorPickerString_saveCvars(entity me)
+void XonoticColorpickerString_saveCvars(entity me)
 {
 	if (!me.cvarName)
 		return;
@@ -120,4 +99,3 @@ void XonoticColorpickerString_draw(entity me)
 
 	draw_alpha = save;
 }
-#endif