X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcolorpicker.qc;h=f7d72439db5f2011dba96eb14aeab8269159abfd;hb=9dd43f196ca7bc0979f94a0fb0f87cdd82a951c7;hp=6634728f30103573984c3f44ae7c36af3126fec1;hpb=244e5081c5c503c307e557c98ac864f6c9731475;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/colorpicker.qc b/qcsrc/menu/xonotic/colorpicker.qc
index 6634728f3..f7d72439d 100644
--- a/qcsrc/menu/xonotic/colorpicker.qc
+++ b/qcsrc/menu/xonotic/colorpicker.qc
@@ -1,16 +1,18 @@
-#ifdef INTERFACE
-CLASS(XonoticColorpicker) EXTENDS(Image)
-	METHOD(XonoticColorpicker, configureXonoticColorpicker, void(entity, entity))
-	METHOD(XonoticColorpicker, mousePress, float(entity, vector))
-	METHOD(XonoticColorpicker, mouseRelease, float(entity, vector))
-	METHOD(XonoticColorpicker, mouseDrag, float(entity, vector))
+#ifndef COLORPICKER_H
+#define COLORPICKER_H
+#include "../item/image.qc"
+CLASS(XonoticColorpicker, Image)
+	METHOD(XonoticColorpicker, configureXonoticColorpicker, void(entity, entity));
+	METHOD(XonoticColorpicker, mousePress, float(entity, vector));
+	METHOD(XonoticColorpicker, mouseRelease, float(entity, vector));
+	METHOD(XonoticColorpicker, mouseDrag, float(entity, vector));
 	ATTRIB(XonoticColorpicker, controlledTextbox, entity, NULL)
 	ATTRIB(XonoticColorpicker, image, string, SKINGFX_COLORPICKER)
 	ATTRIB(XonoticColorpicker, imagemargin, vector, SKINMARGIN_COLORPICKER)
 	ATTRIB(XonoticColorpicker, focusable, float, 1)
-	METHOD(XonoticColorpicker, focusLeave, void(entity))
-	METHOD(XonoticColorpicker, keyDown, float(entity, float, float, float))
-	METHOD(XonoticColorpicker, draw, void(entity))
+	METHOD(XonoticColorpicker, focusLeave, void(entity));
+	METHOD(XonoticColorpicker, keyDown, float(entity, float, float, float));
+	METHOD(XonoticColorpicker, draw, void(entity));
 ENDCLASS(XonoticColorpicker)
 entity makeXonoticColorpicker(entity theTextbox);
 #endif
@@ -19,7 +21,7 @@ entity makeXonoticColorpicker(entity theTextbox);
 entity makeXonoticColorpicker(entity theTextbox)
 {
 	entity me;
-	me = spawnXonoticColorpicker();
+	me = NEW(XonoticColorpicker);
 	me.configureXonoticColorpicker(me, theTextbox);
 	return me;
 }
@@ -139,6 +141,7 @@ float XonoticColorpicker_mouseDrag(entity me, vector coords)
 
 float XonoticColorpicker_mouseRelease(entity me, vector coords)
 {
+	m_play_click_sound(MENU_SOUND_SLIDE);
 	me.mouseDrag(me, coords);
 	return 1;
 }