From b0becb5a2d28550a089e6e0ef2d041956dc887e4 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 11 Oct 2020 10:39:04 +0300
Subject: [PATCH] UnicodeMakeUpperCase move + arg fix

---
 src/render/Font.cpp | 14 ++++++++++++++
 src/render/Font.h   |  1 +
 src/text/Text.cpp   | 16 +---------------
 src/text/Text.h     |  1 -
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index 7459c101..8deac7bf 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -31,6 +31,20 @@ UnicodeStrlen(const wchar *str)
 	return len;
 }
 
+void
+UnicodeMakeUpperCase(wchar *dst, const wchar *src) //idk what to do with it, seems to be incorrect implementation by R*
+{
+	while (*src != '\0') {
+		if (*src < 'a' || *src > 'z')
+			*dst = *src;
+		else
+			*dst = *src - 32;
+		dst++;
+		src++;
+	}
+	*dst = '\0';
+}
+
 CFontDetails CFont::Details;
 int16 CFont::NewLine;
 CSprite2d CFont::Sprite[MAX_FONTS];
diff --git a/src/render/Font.h b/src/render/Font.h
index f0ca9760..47a39f73 100644
--- a/src/render/Font.h
+++ b/src/render/Font.h
@@ -4,6 +4,7 @@ void AsciiToUnicode(const char *src, wchar *dst);
 void UnicodeStrcpy(wchar *dst, const wchar *src);
 void UnicodeStrcat(wchar *dst, wchar *append);
 int UnicodeStrlen(const wchar *str);
+void UnicodeMakeUpperCase(wchar *dst, const wchar *src);
 
 struct CFontDetails
 {
diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index a76bc404..5adc576a 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -431,6 +431,7 @@ CData::Unload(void)
 	numChars = 0;
 }
 
+void
 CMissionTextOffsets::Load(size_t table_size, int file, size_t *offset, int)
 {
 #if DUMB
@@ -457,7 +458,6 @@ CMissionTextOffsets::Load(size_t table_size, int file, size_t *offset, int)
 #endif
 }
 
-void
 char*
 UnicodeToAscii(wchar *src)
 {
@@ -525,20 +525,6 @@ UnicodeToAsciiForMemoryCard(wchar *src)
 	return aStr;
 }
 
-void
-UnicodeMakeUpperCase(wchar *dst, wchar *src) //idk what to do with it, seems to be incorrect implementation by R*
-{
-	while (*src != '\0') {
-		if (*src < 'a' || *src > 'z')
-			*dst = *src;
-		else
-			*dst = *src - 32;
-		dst++;
-		src++;
-	}
-	*dst = '\0';
-}
-
 void
 TextCopy(wchar *dst, const wchar *src)
 {
diff --git a/src/text/Text.h b/src/text/Text.h
index d18c564b..33dc313e 100644
--- a/src/text/Text.h
+++ b/src/text/Text.h
@@ -4,7 +4,6 @@ char *UnicodeToAscii(wchar *src);
 char *UnicodeToAsciiForSaveLoad(wchar *src);
 char *UnicodeToAsciiForMemoryCard(wchar *src);
 void TextCopy(wchar *dst, const wchar *src);
-void UnicodeMakeUpperCase(wchar *dst, wchar *src);
 
 struct CKeyEntry
 {