Merge remote branch 'origin/master' into terencehill/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / colorpicker.c

diff --git a/qcsrc/menu/xonotic/colorpicker.c b/qcsrc/menu/xonotic/colorpicker.c
index a8403aee955b79c5171fd1c7e8e1b000894eb92c..b888358c3748fe6919a39da1a3f038f90702bc84 100644 (file)
--- a/qcsrc/menu/xonotic/colorpicker.c
+++ b/qcsrc/menu/xonotic/colorpicker.c
@@ -24,13 +24,13 @@ entity makeXonoticColorpicker(entity theTextbox)
        return me;
 }
 
-void configureXonoticColorpickerXonoticColorpicker(entity me, entity theTextbox)
+void XonoticColorpicker_configureXonoticColorpicker(entity me, entity theTextbox)
 {
        me.controlledTextbox = theTextbox;
        me.configureImage(me, me.image);
 }
 
-float mousePressXonoticColorpicker(entity me, vector coords)
+float XonoticColorpicker_mousePress(entity me, vector coords)
 {
        me.mouseDrag(me, coords);
        return 1;
@@ -51,7 +51,7 @@ vector hslimage_color(vector v, vector margin)
         return hsl_to_rgb(v_x * 6 * eX + eY + v_y / 0.875 * eZ);
 }
 
-float mouseDragXonoticColorpicker(entity me, vector coords)
+float XonoticColorpicker_mouseDrag(entity me, vector coords)
 {
        float i;
        for(;;)
@@ -97,23 +97,23 @@ float mouseDragXonoticColorpicker(entity me, vector coords)
        return 1;
 }
 
-float mouseReleaseXonoticColorpicker(entity me, vector coords)
+float XonoticColorpicker_mouseRelease(entity me, vector coords)
 {
        me.mouseDrag(me, coords);
        return 1;
 }
 
-void focusLeaveXonoticColorpicker(entity me)
+void XonoticColorpicker_focusLeave(entity me)
 {
        me.controlledTextbox.saveCvars(me.controlledTextbox);
 }
-float keyDownXonoticColorpicker(entity me, float key, float ascii, float shift)
+float XonoticColorpicker_keyDown(entity me, float key, float ascii, float shift)
 {
        return me.controlledTextbox.keyDown(me.controlledTextbox, key, ascii, shift);
 }
-void drawXonoticColorpicker(entity me)
+void XonoticColorpicker_draw(entity me)
 {
-       drawImage(me);
+       SUPER(XonoticColorpicker).draw(me);
 
        float B, C, aC;
        C = cvar("r_textcontrast");