X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fcheckbox.qc;h=c7f51a63ad74307b044c76bf8b92fbda30ad9d52;hb=cf41044c9d897080866da6e0ca39d807e094e23e;hp=e8b4e15e339349ad655af6f866aefccd5eb35796;hpb=125d619e9ab2a307b15b7ee1a2ededed32c7e84d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/item/checkbox.qc b/qcsrc/menu/item/checkbox.qc index e8b4e15e3..c7f51a63a 100644 --- a/qcsrc/menu/item/checkbox.qc +++ b/qcsrc/menu/item/checkbox.qc @@ -1,22 +1,5 @@ -#ifndef ITEM_CHECKBOX_H -#define ITEM_CHECKBOX_H -#include "button.qc" -void CheckBox_Click(entity me, entity other); -CLASS(CheckBox, Button) - METHOD(CheckBox, configureCheckBox, void(entity, string, float, string)) - METHOD(CheckBox, draw, void(entity)) - METHOD(CheckBox, playClickSound, void(entity)) - METHOD(CheckBox, toString, string(entity)) - METHOD(CheckBox, setChecked, void(entity, float)) - ATTRIB(CheckBox, useDownAsChecked, float, 0) - ATTRIB(CheckBox, checked, float, 0) - ATTRIB(CheckBox, onClick, void(entity, entity), CheckBox_Click) - ATTRIB(CheckBox, srcMulti, float, 0) - ATTRIB(CheckBox, disabled, float, 0) -ENDCLASS(CheckBox) -#endif +#include "checkbox.qh" -#ifdef IMPLEMENTATION void CheckBox_setChecked(entity me, float val) { me.checked = val; @@ -38,13 +21,12 @@ void CheckBox_draw(entity me) { float s; s = me.pressed; - if(me.useDownAsChecked) - { + if (me.useDownAsChecked) { me.srcSuffix = string_null; me.forcePressed = me.checked; - } - else + } else { me.srcSuffix = (me.checked ? "1" : "0"); + } me.pressed = s; SUPER(CheckBox).draw(me); } @@ -52,4 +34,3 @@ void CheckBox_playClickSound(entity me) { m_play_click_sound(MENU_SOUND_SELECT); } -#endif