Merge branch 'DefaultUser/gametype_votescreen' 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 52b53b8f1d15d3f31f7fd70c7dc39ca40ab7e462..95a3b53c54b9950b7b7dc525669c40b583f08895 100644 (file)
--- a/qcsrc/common/command/markup.qc
+++ b/qcsrc/common/command/markup.qc
@@ -1,13 +1,5 @@
-#if defined(CSQC)
-       #include "../../dpdefs/csprogsdefs.qc"
-       #include "../util.qh"
-       #include "markup.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../../dpdefs/dpextensions.qc"
-    #include "../util.qh"
-    #include "markup.qh"
-#endif
+#include "markup.qh"
+#include "command.qh"
 
 // =========================================================
 //  Markup chat characters command code, reworked by Samual
@@ -61,7 +53,6 @@ void GenericCommand_markup_init()
        markup_from[i] = "&.."; markup_to[i] = "\x9e"; ++i;
        markup_from[i] = "&.)"; markup_to[i] = "\x9f"; ++i;
        markup_from[i] = "&<|"; markup_to[i] = "\xff"; ++i;
-       unused_float = i;
 }
 
 string GenericCommand_markup(string s2)