X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcolorpicker_string.qc;h=5a44e58830862c9e668185b3f21bda1bffadd076;hp=0695f057ea034d625b7e5804e38aa85b81480dc4;hb=7e5268799e95d0dd6f2b77ed4e097b0adc755f2b;hpb=fbb96108e5828a7557694db4469c2d0d7c582846

diff --git a/qcsrc/menu/xonotic/colorpicker_string.qc b/qcsrc/menu/xonotic/colorpicker_string.qc
index 0695f057e..5a44e5883 100644
--- a/qcsrc/menu/xonotic/colorpicker_string.qc
+++ b/qcsrc/menu/xonotic/colorpicker_string.qc
@@ -1,25 +1,7 @@
-#ifndef COLORPICKER_STRING_H
-#define COLORPICKER_STRING_H
-#include "../item/image.qc"
-CLASS(XonoticColorpickerString, 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;
@@ -30,14 +12,9 @@ entity makeXonoticColorpickerString(string theCvar, string theDefaultCvar)
 
 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)
@@ -73,10 +50,10 @@ void XonoticColorpickerString_saveCvars(entity me)
 		cvar_set(me.cvarName, sprintf("%v", hslimage_color(me.prevcoords, me.imagemargin)));
 }
 
-float XonoticColorpickerString_mousePress(entity me, vector coords)
+METHOD(XonoticColorpickerString, mousePress, bool(XonoticColorpickerString this, vector pos))
 {
-	me.mouseDrag(me, coords);
-	return 1;
+	this.mouseDrag(this, pos);
+	return true;
 }
 
 float XonoticColorpickerString_mouseDrag(entity me, vector coords)
@@ -122,4 +99,3 @@ void XonoticColorpickerString_draw(entity me)
 
 	draw_alpha = save;
 }
-#endif