X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Finputbox.qc;h=de1580160edb904f3de775482c9dcdc8c03cab35;hb=fc2be4c1e7547ae97301f7966333e4dc858baf92;hp=5d7d179995028719bc107d1158edcd91678bc1e8;hpb=128cea32714586feb51b4a0d78a6bd4e35fef9f2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/inputbox.qc b/qcsrc/menu/xonotic/inputbox.qc index 5d7d17999..de1580160 100644 --- a/qcsrc/menu/xonotic/inputbox.qc +++ b/qcsrc/menu/xonotic/inputbox.qc @@ -1,5 +1,7 @@ -#ifdef INTERFACE -CLASS(XonoticInputBox) EXTENDS(InputBox) +#ifndef INPUTBOX_H +#define INPUTBOX_H +#include "../item/inputbox.qc" +CLASS(XonoticInputBox, InputBox) METHOD(XonoticInputBox, configureXonoticInputBox, void(entity, float, string)) METHOD(XonoticInputBox, focusLeave, void(entity)) METHOD(XonoticInputBox, setText, void(entity, string)) @@ -38,7 +40,7 @@ entity makeXonoticInputBox(float, string); entity makeXonoticInputBox(float doEditColorCodes, string theCvar) { entity me; - me = spawnXonoticInputBox(); + me = NEW(XonoticInputBox); me.configureXonoticInputBox(me, doEditColorCodes, theCvar); return me; } @@ -58,18 +60,18 @@ void XonoticInputBox_focusLeave(entity me) { me.saveCvars(me); } -void XonoticInputBox_setText(entity me, string new) +void XonoticInputBox_setText(entity me, string val) { - if(me.text != new) + if(me.text != val) { - SUPER(XonoticInputBox).setText(me, new); + SUPER(XonoticInputBox).setText(me, val); if(me.onChange) me.onChange(me, me.onChangeEntity); if(me.saveImmediately) me.saveCvars(me); } else - SUPER(XonoticInputBox).setText(me, new); + SUPER(XonoticInputBox).setText(me, val); } void XonoticInputBox_loadCvars(entity me) {