X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcommandbutton.qc;h=8e691a036bab1d97301c55b229aec9afa47cdb04;hb=caa42d15f2b2cd3ed4bc177a9aa70903e67d5142;hp=db1ec61ef2a06aea43e50103cc9793eb26ac2c99;hpb=7bae88d09fbd53cce732e31633aea92671b43699;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/commandbutton.qc b/qcsrc/menu/xonotic/commandbutton.qc
index db1ec61ef..8e691a036 100644
--- a/qcsrc/menu/xonotic/commandbutton.qc
+++ b/qcsrc/menu/xonotic/commandbutton.qc
@@ -1,28 +1,16 @@
-#ifndef COMMANDBUTTON_CLOSE
-# define COMMANDBUTTON_CLOSE 1
-# define COMMANDBUTTON_APPLY 2
-//# define COMMANDBUTTON_REVERT 4
-#endif
+#include "commandbutton.qh"
 
-#ifndef COMMANDBUTTON_H
-#define COMMANDBUTTON_H
-#include "button.qc"
-CLASS(XonoticCommandButton, XonoticButton)
-	METHOD(XonoticCommandButton, configureXonoticCommandButton, void(entity, string, vector, string, float));
-	ATTRIB(XonoticCommandButton, onClickCommand, string, string_null)
-	ATTRIB(XonoticCommandButton, flags, float, 0)
-ENDCLASS(XonoticCommandButton)
-entity makeXonoticCommandButton(string theText, vector theColor, string theCommand, float closesMenu);
-#endif
-
-#ifdef IMPLEMENTATION
-entity makeXonoticCommandButton(string theText, vector theColor, string theCommand, float theFlags)
+entity makeXonoticCommandButton_T(string theText, vector theColor, string theCommand, float theFlags, string theTooltip)
 {
 	entity me;
 	me = NEW(XonoticCommandButton);
-	me.configureXonoticCommandButton(me, theText, theColor, theCommand, theFlags);
+	me.configureXonoticCommandButton(me, theText, theColor, theCommand, theFlags, theTooltip);
 	return me;
 }
+entity makeXonoticCommandButton(string theText, vector theColor, string theCommand, float theFlags)
+{
+	return makeXonoticCommandButton_T(theText, theColor, theCommand, theFlags, string_null);
+}
 
 void XonoticCommandButton_Click(entity me, entity other)
 {
@@ -35,12 +23,11 @@ void XonoticCommandButton_Click(entity me, entity other)
 		m_goto(string_null);
 }
 
-void XonoticCommandButton_configureXonoticCommandButton(entity me, string theText, vector theColor, string theCommand, float theFlags)
+void XonoticCommandButton_configureXonoticCommandButton(entity me, string theText, vector theColor, string theCommand, float theFlags, string theTooltip)
 {
-	me.configureXonoticButton(me, theText, theColor);
+	me.configureXonoticButton(me, theText, theColor, theTooltip);
 	me.onClickCommand = theCommand;
 	me.flags = theFlags;
 	me.onClick = XonoticCommandButton_Click;
 	me.onClickEntity = me;
 }
-#endif