X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Finputbox.c;h=5d7d179995028719bc107d1158edcd91678bc1e8;hb=a94cd06c4cc5cb8c51ccb40ef77f93b4b6131207;hp=249fa64ff6f49f4f32f50bb137c9d4977be84c93;hpb=08000124aa049edef5ee12968d402dd56be93f94;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/inputbox.c b/qcsrc/menu/xonotic/inputbox.c
index 249fa64ff..5d7d17999 100644
--- a/qcsrc/menu/xonotic/inputbox.c
+++ b/qcsrc/menu/xonotic/inputbox.c
@@ -5,9 +5,9 @@ CLASS(XonoticInputBox) EXTENDS(InputBox)
 	METHOD(XonoticInputBox, setText, void(entity, string))
 	ATTRIB(XonoticInputBox, fontSize, float, SKINFONTSIZE_NORMAL)
 	ATTRIB(XonoticInputBox, image, string, SKINGFX_INPUTBOX)
-	ATTRIB(XonoticInputBox, onChange, void(entity, entity), SUB_Null)
+	ATTRIB(XonoticInputBox, onChange, void(entity, entity), func_null)
 	ATTRIB(XonoticInputBox, onChangeEntity, entity, NULL)
-	ATTRIB(XonoticInputBox, onEnter, void(entity, entity), SUB_Null)
+	ATTRIB(XonoticInputBox, onEnter, void(entity, entity), func_null)
 	ATTRIB(XonoticInputBox, onEnterEntity, entity, NULL)
 	ATTRIB(XonoticInputBox, marginLeft, float, SKINMARGIN_INPUTBOX_CHARS)
 	ATTRIB(XonoticInputBox, marginRight, float, SKINMARGIN_INPUTBOX_CHARS)
@@ -26,6 +26,7 @@ CLASS(XonoticInputBox) EXTENDS(InputBox)
 	ATTRIB(XonoticInputBox, cvarName, string, string_null)
 	METHOD(XonoticInputBox, loadCvars, void(entity))
 	METHOD(XonoticInputBox, saveCvars, void(entity))
+	ATTRIB(XonoticInputBox, sendCvars, float, 0)
 	METHOD(XonoticInputBox, keyDown, float(entity, float, float, float))
 
 	ATTRIB(XonoticInputBox, saveImmediately, float, 0)
@@ -62,7 +63,8 @@ void XonoticInputBox_setText(entity me, string new)
 	if(me.text != new)
 	{
 		SUPER(XonoticInputBox).setText(me, new);
-		me.onChange(me, me.onChangeEntity);
+		if(me.onChange)
+			me.onChange(me, me.onChangeEntity);
 		if(me.saveImmediately)
 			me.saveCvars(me);
 	}
@@ -71,15 +73,16 @@ void XonoticInputBox_setText(entity me, string new)
 }
 void XonoticInputBox_loadCvars(entity me)
 {
-	if not(me.cvarName)
+	if (!me.cvarName)
 		return;
 	SUPER(XonoticInputBox).setText(me, cvar_string(me.cvarName));
 }
 void XonoticInputBox_saveCvars(entity me)
 {
-	if not(me.cvarName)
+	if (!me.cvarName)
 		return;
 	cvar_set(me.cvarName, me.text);
+	CheckSendCvars(me, me.cvarName);
 }
 float XonoticInputBox_keyDown(entity me, float key, float ascii, float shift)
 {
@@ -92,7 +95,8 @@ float XonoticInputBox_keyDown(entity me, float key, float ascii, float shift)
 			me.saveCvars(me);
 			r = 1;
 		}
-		me.onEnter(me, me.onEnterEntity);
+		if(me.onEnter)
+			me.onEnter(me, me.onEnterEntity);
 	}
 	if(SUPER(XonoticInputBox).keyDown(me, key, ascii, shift))
 		r = 1;