summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-07-24 20:07:23 +0200
committerGitHub <noreply@github.com>2020-07-24 20:07:23 +0200
commitb05cb3f1a3a1a5fbc18efe78a58e1408a1f2ffda (patch)
tree929528298d437e2868071683228743f47accc173 /src/render
parentMerge pull request #661 from erorcun/miami (diff)
parent90% fixes, 10% skel refactoring (diff)
downloadre3-b05cb3f1a3a1a5fbc18efe78a58e1408a1f2ffda.tar
re3-b05cb3f1a3a1a5fbc18efe78a58e1408a1f2ffda.tar.gz
re3-b05cb3f1a3a1a5fbc18efe78a58e1408a1f2ffda.tar.bz2
re3-b05cb3f1a3a1a5fbc18efe78a58e1408a1f2ffda.tar.lz
re3-b05cb3f1a3a1a5fbc18efe78a58e1408a1f2ffda.tar.xz
re3-b05cb3f1a3a1a5fbc18efe78a58e1408a1f2ffda.tar.zst
re3-b05cb3f1a3a1a5fbc18efe78a58e1408a1f2ffda.zip
Diffstat (limited to '')
-rw-r--r--src/render/Font.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index a3ead932..1e60083b 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -1133,7 +1133,11 @@ CFont::ParseToken(wchar *s)
case 'r': SetColor(CRGBA(255, 150, 225, 255)); Details.anonymous_23 = true; break;
case 't': SetColor(CRGBA(86, 212, 146, 255)); Details.anonymous_23 = true; break;
case 'w': SetColor(CRGBA(175, 175, 175, 255)); Details.anonymous_23 = true; break;
+#ifdef FIX_BUGS
+ case 'x': SetColor(CRGBA(0, 255, 255, 255)); Details.anonymous_23 = true; break;
+#else
case 'x': SetColor(CRGBA(132, 146, 197, 255)); Details.anonymous_23 = true; break;
+#endif
case 'y': SetColor(CRGBA(255, 227, 79, 255)); Details.anonymous_23 = true; break;
}
while(*s != '~') s++;
@@ -1208,11 +1212,19 @@ CFont::ParseToken(wchar* str, CRGBA &color, bool &flash, bool &bold)
color.g = 175;
color.b = 175;
break;
+#ifdef FIX_BUGS
+ case 'x':
+ color.r = 0;
+ color.g = 255;
+ color.b = 255;
+ break;
+#else
case 'x':
color.r = 132;
color.g = 146;
color.b = 197;
break;
+#endif
case 'y':
color.r = 255;
color.g = 227;