Merge branch 'martin-t/spec' into 'master'

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

diff --git a/qcsrc/common/command/markup.qc b/qcsrc/common/command/markup.qc
index cb1a8cc37144eb23c069b6b1294ccb5510073520..95a3b53c54b9950b7b7dc525669c40b583f08895 100644 (file)
--- a/qcsrc/common/command/markup.qc
+++ b/qcsrc/common/command/markup.qc
@@ -1,3 +1,6 @@
+#include "markup.qh"
+#include "command.qh"
+
 // =========================================================
 //  Markup chat characters command code, reworked by Samual
 //  Last updated: December 28th, 2011
@@ -5,11 +8,10 @@
 
 void GenericCommand_markup_init()
 {
-       float i;
        if (markup_init)
                return;
-       markup_init = 1;
-       i = 0;
+       markup_init = true;
+       int i = 0;
        markup_from[i] = "&alien"; markup_to[i] = "\x12"; ++i;
        markup_from[i] = "&:-)"; markup_to[i] = "\x13"; ++i;
        markup_from[i] = "&:-("; markup_to[i] = "\x14"; ++i;
@@ -55,7 +57,7 @@ void GenericCommand_markup_init()
 
 string GenericCommand_markup(string s2)
 {
-       float red, ccase, i, j;
+       int red, ccase, i, j;
        string s, s3;
 
        GenericCommand_markup_init();