Merge branch 'master' into martin-t/globals

[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 331e2a5d7076b2615e81944df613e57604ec9c99..7a1b3876af07e726b3d120678562214f399e2f3e 100644 (file)
--- a/qcsrc/common/command/markup.qh
+++ b/qcsrc/common/command/markup.qh
@@ -1,9 +1,13 @@
-// =========================================================
-//  Markup chat characters command code, reworked by Samual
+#pragma once
+
+// ==========================================================
+//  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);