Merge branch 'terencehill/unlimited_ammo_fixes' 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 d1562aaac4222c1ebf8eedbbfdf60f7d22ffc001..8030f9e0076d9a7f128cabdb2c672d4a02f5152b 100644 (file)
--- a/qcsrc/common/command/markup.qc
+++ b/qcsrc/common/command/markup.qc
@@ -1,3 +1,5 @@
+#include "markup.qh"
+
 // =========================================================
 //  Markup chat characters command code, reworked by Samual
 //  Last updated: December 28th, 2011
@@ -5,11 +7,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;
@@ -56,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();