Merge branch 'master' into terencehill/lms_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / bigcommandbutton.qc

diff --git a/qcsrc/menu/xonotic/bigcommandbutton.qc b/qcsrc/menu/xonotic/bigcommandbutton.qc
index 6798d9b01b2602ba4cae85e78768788a6dde2467..d4a16f31dade4344a2191bd70f5d143704822a3f 100644 (file)
--- a/qcsrc/menu/xonotic/bigcommandbutton.qc
+++ b/qcsrc/menu/xonotic/bigcommandbutton.qc
@@ -1,25 +1,18 @@
-#ifndef BIGCOMMANDBUTTON_H
-#define BIGCOMMANDBUTTON_H
-#include "commandbutton.qc"
-CLASS(XonoticBigCommandButton, XonoticCommandButton)
-       METHOD(XonoticBigCommandButton, configureXonoticBigCommandButton, void(entity, string, vector, string, float))
-       ATTRIB(XonoticBigCommandButton, image, string, SKINGFX_BUTTON_BIG)
-       ATTRIB(XonoticBigCommandButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY)
-ENDCLASS(XonoticBigCommandButton)
-entity makeXonoticBigCommandButton(string theText, vector theColor, string theCommand, float closesMenu);
-#endif
+#include "bigcommandbutton.qh"
 
-#ifdef IMPLEMENTATION
-entity makeXonoticBigCommandButton(string theText, vector theColor, string theCommand, float theFlags)
+entity makeXonoticBigCommandButton_T(string theText, vector theColor, string theCommand, int theFlags, string theTooltip)
 {
        entity me;
        me = NEW(XonoticBigCommandButton);
-       me.configureXonoticBigCommandButton(me, theText, theColor, theCommand, theFlags);
+       me.configureXonoticBigCommandButton(me, theText, theColor, theCommand, theFlags, theTooltip);
        return me;
 }
+entity makeXonoticBigCommandButton(string theText, vector theColor, string theCommand, int theFlags)
+{
+       return makeXonoticBigCommandButton_T(theText, theColor, theCommand, theFlags, string_null);
+}
 
-void XonoticBigCommandButton_configureXonoticBigCommandButton(entity me, string theText, vector theColor, string theCommand, float theFlags)
+void XonoticBigCommandButton_configureXonoticBigCommandButton(entity me, string theText, vector theColor, string theCommand, int theFlags, string theTooltip)
 {
-       me.configureXonoticCommandButton(me, theText, theColor, theCommand, theFlags);
+       me.configureXonoticCommandButton(me, theText, theColor, theCommand, theFlags, theTooltip);
 }
-#endif