Merge branch 'master' into terencehill/freezetag_fixes

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

diff --git a/qcsrc/menu/item/checkbox.c b/qcsrc/menu/item/checkbox.c
index 40fa6675bd0df2ba8d1e92b51c8a4233bfa3d38a..94f67ba709ef7422b1d0b3a76e488b1b9f8f5acf 100644 (file)
--- a/qcsrc/menu/item/checkbox.c
+++ b/qcsrc/menu/item/checkbox.c
@@ -14,7 +14,7 @@ ENDCLASS(CheckBox)
 #endif
 
 #ifdef IMPLEMENTATION
-void setCheckedCheckBox(entity me, float val)
+void CheckBox_setChecked(entity me, float val)
 {
        me.checked = val;
 }
@@ -22,16 +22,16 @@ void CheckBox_Click(entity me, entity other)
 {
        me.setChecked(me, !me.checked);
 }
-string toStringCheckBox(entity me)
+string CheckBox_toString(entity me)
 {
-       return strcat(toStringLabel(me), ", ", me.checked ? "checked" : "unchecked");
+       return strcat(SUPER(CheckBox).toString(me), ", ", me.checked ? "checked" : "unchecked");
 }
-void configureCheckBoxCheckBox(entity me, string txt, float sz, string gfx)
+void CheckBox_configureCheckBox(entity me, string txt, float sz, string gfx)
 {
        me.configureButton(me, txt, sz, gfx);
        me.align = 0;
 }
-void drawCheckBox(entity me)
+void CheckBox_draw(entity me)
 {
        float s;
        s = me.pressed;
@@ -42,7 +42,7 @@ void drawCheckBox(entity me)
        }
        else
                me.srcSuffix = (me.checked ? "1" : "0");
-       drawButton(me);
        me.pressed = s;
+       SUPER(CheckBox).draw(me);
 }
 #endif