Merge branch 'master' into VC/TextFinish

# Conflicts:
#	src/text/Text.cpp

src/audio/DMAudio.cpp

@@ -5,6 +5,7 @@
 #include "AudioManager.h"
 #include "AudioScriptObject.h"
 #include "sampman.h"
+#include "Font.h"
 #include "Text.h"
 #include "crossplatform.h"
 

src/render/Font.cpp

@@ -5,6 +5,32 @@
 #include "Font.h"
 #include "Timer.h"
 
+void
+AsciiToUnicode(const char *src, wchar *dst)
+{
+	while((*dst++ = (unsigned char)*src++) != '\0');
+}
+
+void
+UnicodeStrcat(wchar *dst, wchar *append)
+{
+	UnicodeStrcpy(&dst[UnicodeStrlen(dst)], append);
+}
+
+void
+UnicodeStrcpy(wchar *dst, const wchar *src)
+{
+	while((*dst++ = *src++) != '\0');
+}
+
+int
+UnicodeStrlen(const wchar *str)
+{
+	int len;
+	for(len = 0; *str != '\0'; len++, str++);
+	return len;
+}
+
 CFontDetails CFont::Details;
 int16 CFont::NewLine;
 CSprite2d CFont::Sprite[MAX_FONTS];

src/render/Font.h

@@ -1,5 +1,10 @@
 #pragma once
 
+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);
+
 struct CFontDetails
 {
 	CRGBA color;

src/save/GenericGameStorage.cpp

@@ -11,6 +11,7 @@
 #include "Clock.h"
 #include "Date.h"
 #include "FileMgr.h"
+#include "Font.h"
 #include "Frontend.h"
 #include "GameLogic.h"
 #include "Gangs.h"

src/save/PCSave.cpp

@@ -3,6 +3,7 @@
 #include "crossplatform.h"
 
 #include "FileMgr.h"
+#include "Font.h"
 #ifdef MORE_LANGUAGES
 #include "Game.h"
 #endif

src/text/Text.cpp

@@ -431,7 +431,6 @@ CData::Unload(void)
 	numChars = 0;
 }
 
-void
 CMissionTextOffsets::Load(size_t table_size, int file, size_t *offset, int)
 {
 #if DUMB
@@ -459,11 +458,6 @@ CMissionTextOffsets::Load(size_t table_size, int file, size_t *offset, int)
 }
 
 void
-AsciiToUnicode(const char *src, wchar *dst)
-{
-	while((*dst++ = (unsigned char)*src++) != '\0');
-}
-
 char*
 UnicodeToAscii(wchar *src)
 {
@@ -522,7 +516,7 @@ UnicodeToAsciiForMemoryCard(wchar *src)
 {
 	static char aStr[256];
 	int len;
-	for(len = 0; *src != '\0' && len < 256-1; len++, src++)
+	for(len = 0; *src != '\0' && len < 256; len++, src++)
 		if(*src < 256)
 			aStr[len] = *src;
 		else
@@ -545,26 +539,6 @@ UnicodeMakeUpperCase(wchar *dst, wchar *src) //idk what to do with it, seems to
 	*dst = '\0';
 }
 
-void
-UnicodeStrcpy(wchar *dst, const wchar *src)
-{
-	while((*dst++ = *src++) != '\0');
-}
-
-void
-UnicodeStrcat(wchar *dst, wchar *append)
-{
-	UnicodeStrcpy(&dst[UnicodeStrlen(dst)], append);
-}
-
-int
-UnicodeStrlen(const wchar *str)
-{
-	int len;
-	for(len = 0; *str != '\0'; len++, str++);
-	return len;
-}
-
 void
 TextCopy(wchar *dst, const wchar *src)
 {

src/text/Text.h

@@ -1,12 +1,8 @@
 #pragma once
 
-void AsciiToUnicode(const char *src, wchar *dst);
 char *UnicodeToAscii(wchar *src);
 char *UnicodeToAsciiForSaveLoad(wchar *src);
 char *UnicodeToAsciiForMemoryCard(wchar *src);
-void UnicodeStrcpy(wchar *dst, const wchar *src);
-void UnicodeStrcat(wchar *dst, wchar *append);
-int UnicodeStrlen(const wchar *str);
 void TextCopy(wchar *dst, const wchar *src);
 void UnicodeMakeUpperCase(wchar *dst, wchar *src);