X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcommand%2Fmarkup.qc;h=2397982da99288ca829b3cad5f1dc5883f035bfb;hb=c2ccfecb9ccabc5d37a95d1521d4e75afb1509c1;hp=d1562aaac4222c1ebf8eedbbfdf60f7d22ffc001;hpb=9226d2a17f8329b6964cf4be5c5433e7e763c240;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/command/markup.qc b/qcsrc/common/command/markup.qc
index d1562aaac..2397982da 100644
--- a/qcsrc/common/command/markup.qc
+++ b/qcsrc/common/command/markup.qc
@@ -1,3 +1,7 @@
+#include "markup.qh"
+
+#include <common/command/command.qh>
+
 // =========================================================
 //  Markup chat characters command code, reworked by Samual
 //  Last updated: December 28th, 2011
@@ -5,58 +9,58 @@
 
 void GenericCommand_markup_init()
 {
-	float i;
 	if (markup_init)
 		return;
-	markup_init = 1;
-	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;
-	markup_from[i] = "&x-P"; markup_to[i] = "\x15"; ++i;
-	markup_from[i] = "&:-/"; markup_to[i] = "\x16"; ++i;
-	markup_from[i] = "&:-D"; markup_to[i] = "\x17"; ++i;
-	markup_from[i] = "&<<"; markup_to[i] = "\x18"; ++i;
-	markup_from[i] = "&>>"; markup_to[i] = "\x19"; ++i;
-	markup_from[i] = "&dot"; markup_to[i] = "\x1a"; ++i;
-	markup_from[i] = "&^_"; markup_to[i] = "\x1b"; ++i;
+	markup_init = true;
+	// "&<-" doesn't have a corresponding symbol anymore
+	// replaced with similar triangle facing left ("&<|")
+	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;
+	markup_from[i] = "&x-P";    markup_to[i] = "\x15"; ++i;
+	markup_from[i] = "&:-/";    markup_to[i] = "\x16"; ++i;
+	markup_from[i] = "&:-D";    markup_to[i] = "\x17"; ++i;
+	markup_from[i] = "&<<";     markup_to[i] = "\x18"; ++i;
+	markup_from[i] = "&>>";     markup_to[i] = "\x19"; ++i;
+	markup_from[i] = "&dot";    markup_to[i] = "\x1a"; ++i;
+	markup_from[i] = "&^_";     markup_to[i] = "\x1b"; ++i;
 	markup_from[i] = "&ysplat"; markup_to[i] = "\x1c"; ++i;
-	markup_from[i] = "&-]"; markup_to[i] = "\x1d"; ++i;
-	markup_from[i] = "&--"; markup_to[i] = "\x1e"; ++i;
-	markup_from[i] = "&[-"; markup_to[i] = "\x1f"; ++i;
-	markup_from[i] = "&s<"; markup_to[i] = "\x2c"; ++i;
-	markup_from[i] = "&s>"; markup_to[i] = "\x2e"; ++i;
-	markup_from[i] = "&<-"; markup_to[i] = "\x7f"; ++i;
-	markup_from[i] = "&[="; markup_to[i] = "\x80"; ++i;
-	markup_from[i] = "&=="; markup_to[i] = "\x81"; ++i;
-	markup_from[i] = "&=]"; markup_to[i] = "\x82"; ++i;
-	markup_from[i] = "&r!"; markup_to[i] = "\x84"; ++i;
-	markup_from[i] = "&|o|"; markup_to[i] = "\x85"; ++i;
-	markup_from[i] = "&|u|"; markup_to[i] = "\x86"; ++i;
-	markup_from[i] = "&|i|"; markup_to[i] = "\x87"; ++i;
-	markup_from[i] = "&|c|"; markup_to[i] = "\x88"; ++i;
-	markup_from[i] = "&[c]"; markup_to[i] = "\x89"; ++i;
-	markup_from[i] = "&[n]"; markup_to[i] = "\x8a"; ++i;
-	markup_from[i] = "&[]"; markup_to[i] = "\x8b"; ++i;
-	markup_from[i] = "&r?"; markup_to[i] = "\x8c"; ++i;
-	markup_from[i] = "&|>"; markup_to[i] = "\x8d"; ++i;
+	markup_from[i] = "&-]";     markup_to[i] = "\x1d"; ++i;
+	markup_from[i] = "&--";     markup_to[i] = "\x1e"; ++i;
+	markup_from[i] = "&[-";     markup_to[i] = "\x1f"; ++i;
+	markup_from[i] = "&s<";     markup_to[i] = "\xac"; ++i;
+	markup_from[i] = "&s>";     markup_to[i] = "\xae"; ++i;
+	markup_from[i] = "&<-";     markup_to[i] = "\xff"; ++i; // same as "&<|"
+	markup_from[i] = "&[=";     markup_to[i] = "\x80"; ++i;
+	markup_from[i] = "&==";     markup_to[i] = "\x81"; ++i;
+	markup_from[i] = "&=]";     markup_to[i] = "\x82"; ++i;
+	markup_from[i] = "&r!";     markup_to[i] = "\x84"; ++i;
+	markup_from[i] = "&|o|";    markup_to[i] = "\x85"; ++i;
+	markup_from[i] = "&|u|";    markup_to[i] = "\x86"; ++i;
+	markup_from[i] = "&|i|";    markup_to[i] = "\x87"; ++i;
+	markup_from[i] = "&|c|";    markup_to[i] = "\x88"; ++i;
+	markup_from[i] = "&[c]";    markup_to[i] = "\x89"; ++i;
+	markup_from[i] = "&[n]";    markup_to[i] = "\x8a"; ++i;
+	markup_from[i] = "&[]";     markup_to[i] = "\x8b"; ++i;
+	markup_from[i] = "&r?";     markup_to[i] = "\x8c"; ++i;
+	markup_from[i] = "&|>";     markup_to[i] = "\x8d"; ++i;
 	markup_from[i] = "&splat0"; markup_to[i] = "\x8e"; ++i;
 	markup_from[i] = "&splat1"; markup_to[i] = "\x8f"; ++i;
-	markup_from[i] = "&[["; markup_to[i] = "\x90"; ++i;
-	markup_from[i] = "&]]"; markup_to[i] = "\x91"; ++i;
+	markup_from[i] = "&[[";     markup_to[i] = "\x90"; ++i;
+	markup_from[i] = "&]]";     markup_to[i] = "\x91"; ++i;
 	markup_from[i] = "&splat2"; markup_to[i] = "\x9a"; ++i;
-	markup_from[i] = "&)("; markup_to[i] = "\x9b"; ++i;
+	markup_from[i] = "&)(";     markup_to[i] = "\x9b"; ++i;
 	markup_from[i] = "&splat3"; markup_to[i] = "\x9c"; ++i;
-	markup_from[i] = "&(."; markup_to[i] = "\x9d"; ++i;
-	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;
+	markup_from[i] = "&(.";     markup_to[i] = "\x9d"; ++i;
+	markup_from[i] = "&..";     markup_to[i] = "\x9e"; ++i;
+	markup_from[i] = "&.)";     markup_to[i] = "\x9f"; ++i;
+	markup_from[i] = "&<|";     markup_to[i] = "\xff"; ++i;
 }
 
 string GenericCommand_markup(string s2)
 {
-	float red, ccase, i, j;
+	int red, ccase, i, j;
 	string s, s3;
 
 	GenericCommand_markup_init();
@@ -65,7 +69,8 @@ string GenericCommand_markup(string s2)
 
 	red = 0;
 	ccase = 0;
-	for(i = 0; i < strlen(s2); ++i)
+	int len = strlen(s2);
+	for (i = 0; i < len; ++i)
 	{
 		for(j = 0; j < NUM_MARKUPS; ++j)
 		{