Merge branch 'master' into terencehill/itemstime

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / command / markup.qh

diff --git a/qcsrc/common/command/markup.qh b/qcsrc/common/command/markup.qh
index 6cf09d3ed4829c7c3bccd538b02ee4d08b6917bb..bccc78d0bcd3537d43c4aaa1c91410d47fad7a26 100644 (file)
--- a/qcsrc/common/command/markup.qh
+++ b/qcsrc/common/command/markup.qh
@@ -1,9 +1,15 @@
+#ifndef COMMAND_MARKUP_H
+#define COMMAND_MARKUP_H
+
 // ==========================================================
 //  Declarations for markup command code, reworked by Samual
 //  Last updated: December 28th, 2011
 // ==========================================================
 
-#define NUM_MARKUPS    41
-float markup_init;
+const int NUM_MARKUPS = 41;
+bool markup_init;
 string markup_from[NUM_MARKUPS];
 string markup_to[NUM_MARKUPS];
+
+string GenericCommand_markup(string s2);
+#endif