SLUDGE: Remove UTF8 code

engines/sludge/builtin.cpp

@@ -51,7 +51,6 @@
 #include "sludge/sprites.h"
 #include "sludge/statusba.h"
 #include "sludge/sludge.h"
-#include "sludge/utf8.h"
 #include "sludge/zbuffer.h"
 
 namespace Sludge {
@@ -471,9 +470,7 @@ builtIn(substring) {
 	wholeString = fun->stack->thisVar.getTextFromAnyVar();
 	trimStack(fun->stack);
 
-	UTF8Converter convert;
-	convert.setUTF8String(wholeString);
-	Common::U32String str32 = convert.getU32String();
+	Common::U32String str32 = wholeString.decode(Common::kUtf8);
 
 	if ((int)str32.size() < start + length) {
 		length = str32.size() - start;
@@ -485,10 +482,7 @@ builtIn(substring) {
 		length = 0;
 	}
 
-	int startoffset = convert.getOriginOffset(start);
-	int endoffset = convert.getOriginOffset(start + length);
-
-	Common::String newString(wholeString.begin() + startoffset, wholeString.begin() + endoffset);
+	Common::String newString = str32.substr(start, length).encode(Common::kUtf8);
 
 	fun->reg.makeTextVar(newString);
 	return BR_CONTINUE;

engines/sludge/fonttext.cpp

@@ -63,7 +63,7 @@ bool TextManager::isInFont(const Common::String &theText) {
 	if (theText.empty())
 		return 0;
 
-	Common::U32String str32 = UTF8Converter::convertUtf8ToUtf32(theText);
+	Common::U32String str32 = theText.decode(Common::kUtf8);
 
 	// We don't want to compare strings. Only single characters allowed!
 	if (str32.size() > 1)
@@ -72,11 +72,11 @@ bool TextManager::isInFont(const Common::String &theText) {
 	uint32 c = str32[0];
 
 	// check if font order contains the utf8 char
-	return _fontOrder.getU32String().contains(c);
+	return _fontOrder.contains(c);
 }
 
 int TextManager::stringLength(const Common::String &theText) {
-	Common::U32String str32 = UTF8Converter::convertUtf8ToUtf32(theText);
+	Common::U32String str32 = theText.decode(Common::kUtf8);
 	return str32.size();
 }
 
@@ -86,7 +86,7 @@ int TextManager::stringWidth(const Common::String &theText) {
 	if (_fontTable.empty())
 		return 0;
 
-	Common::U32String str32 = UTF8Converter::convertUtf8ToUtf32(theText);
+	Common::U32String str32 = theText.decode(Common::kUtf8);
 
 	for (uint i = 0; i < str32.size(); ++i) {
 		uint32 c = str32[i];
@@ -102,7 +102,7 @@ void TextManager::pasteString(const Common::String &theText, int xOff, int y, Sp
 
 	xOff += (int)((float)(_fontSpace >> 1) / g_sludge->_gfxMan->getCamZoom());
 
-	Common::U32String str32 = UTF8Converter::convertUtf8ToUtf32(theText);
+	Common::U32String str32 = theText.decode(Common::kUtf8);
 
 	for (uint32 i = 0; i < str32.size(); ++i) {
 		uint32 c = str32[i];
@@ -116,7 +116,7 @@ void TextManager::pasteStringToBackdrop(const Common::String &theText, int xOff,
 	if (_fontTable.empty())
 		return;
 
-	Common::U32String str32 = UTF8Converter::convertUtf8ToUtf32(theText);
+	Common::U32String str32 = theText.decode(Common::kUtf8);
 
 	xOff += _fontSpace >> 1;
 	for (uint32 i = 0; i < str32.size(); ++i) {
@@ -131,7 +131,7 @@ void TextManager::burnStringToBackdrop(const Common::String &theText, int xOff,
 	if (_fontTable.empty())
 		return;
 
-	Common::U32String str32 = UTF8Converter::convertUtf8ToUtf32(theText);
+	Common::U32String str32 = theText.decode(Common::kUtf8);
 
 	xOff += _fontSpace >> 1;
 	for (uint i = 0; i < str32.size(); ++i) {
@@ -143,14 +143,14 @@ void TextManager::burnStringToBackdrop(const Common::String &theText, int xOff,
 }
 
 bool TextManager::loadFont(int filenum, const Common::String &charOrder, int h) {
-	_fontOrder.setUTF8String(charOrder);
+	_fontOrder = charOrder.decode(Common::kUtf8);
 
 	g_sludge->_gfxMan->forgetSpriteBank(_theFont);
 
 	_loadedFontNum = filenum;
 
 	// get max value among all utf8 chars
-	Common::U32String fontOrderString = _fontOrder.getU32String();
+	Common::U32String fontOrderString = _fontOrder;
 
 	// create an index table from utf8 char to the index
 	if (!_fontTable.empty()) {
@@ -178,7 +178,7 @@ void TextManager::saveFont(Common::WriteStream *stream) {
 	if (!_fontTable.empty()) {
 		stream->writeUint16BE(_loadedFontNum);
 		stream->writeUint16BE(_fontHeight);
-		writeString(_fontOrder.getUTF8String(), stream);
+		writeString(_fontOrder.encode(Common::kUtf8), stream);
 	}
 	stream->writeSint16LE(_fontSpace);
 }

engines/sludge/fonttext.h

@@ -26,7 +26,6 @@
 #include "common/ustr.h"
 
 #include "sludge/sprites.h"
-#include "sludge/utf8.h"
 
 namespace Sludge {
 
@@ -62,7 +61,7 @@ class TextManager {
 private:
 	SpriteBank _theFont;
 	int _fontHeight, _numFontColours, _loadedFontNum;
-	UTF8Converter _fontOrder;
+	Common::U32String _fontOrder;
 	int16 _fontSpace;
 	SpritePalette _pastePalette;
 

engines/sludge/loadsave.cpp

@@ -45,7 +45,6 @@
 #include "sludge/sprites.h"
 #include "sludge/statusba.h"
 #include "sludge/speech.h"
-#include "sludge/utf8.h"
 #include "sludge/variable.h"
 #include "sludge/version.h"
 #include "sludge/zbuffer.h"

engines/sludge/module.mk

@@ -36,7 +36,6 @@ MODULE_OBJS := \
 	thumbnail.o \
 	timing.o \
 	transition.o \
-	utf8.o \
 	variable.o \
 	zbuffer.o \