Fix Text n Pager

2 files changed, 285 insertions, 285 deletions

diff --git a/src/text/Pager.h b/src/text/Pager.h
index 727eeb24..1719e726 100644
--- a/src/text/Pager.h
+++ b/src/text/Pager.h
@@ -1,5 +1,5 @@
 #pragma once

-
+

 struct PagerMessage {

 	wchar *m_pText;

 	uint16 m_nSpeedMs;

@@ -9,20 +9,20 @@ struct PagerMessage {
 	uint32 m_nTimeToChangePosition;

 	int16 field_10;

 	int32 m_nNumber[6];

-};
-
-#define NUMPAGERMESSAGES 8
-
-class CPager
-{
+};

+

+#define NUMPAGERMESSAGES 8

+

+class CPager

+{

 	int16 m_nNumDisplayLetters;

-	PagerMessage m_messages[NUMPAGERMESSAGES];
+	PagerMessage m_messages[NUMPAGERMESSAGES];

 public:

-	void Init();
-	void Process();
-	void Display();
+	void Init();

+	void Process();

+	void Display();

 	void AddMessage(wchar*, uint16, uint16, uint16);

-	void AddMessageWithNumber(wchar *str, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, uint16 speed, uint16 priority, uint16 a11);
-	void ClearMessages();
-	void RestartCurrentMessage();
+	void AddMessageWithNumber(wchar *str, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, uint16 speed, uint16 priority, uint16 a11);

+	void ClearMessages();

+	void RestartCurrentMessage();

 };
\ No newline at end of file
diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index 40717ed5..8bffa7e1 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -1,92 +1,92 @@
-#include "common.h"
-#include "patcher.h"
-#include "FileMgr.h"
-#include "Frontend.h"
-#include "Messages.h"
-#include "Text.h"
-
-static wchar WideErrorString[25];
-
-CText &TheText = *(CText*)0x941520;
-
-CText::CText(void)
-{
-	encoding = 'e';
-	memset(WideErrorString, 0, sizeof(WideErrorString));
-}
-
-void
-CText::Load(void)
-{
-	uint8 *filedata;
-	char filename[32], type[4];
-	int length;
-	int offset, sectlen;
-
-	Unload();
-	filedata = new uint8[0x40000];
-
-	CFileMgr::SetDir("TEXT");
-	switch(CMenuManager::m_PrefsLanguage){
-	case LANGUAGE_AMERICAN:
-		sprintf(filename, "AMERICAN.GXT");
-		break;
-	case LANGUAGE_FRENCH:
-		sprintf(filename, "FRENCH.GXT");
-		break;
-	case LANGUAGE_GERMAN:
-		sprintf(filename, "GERMAN.GXT");
-		break;
-	case LANGUAGE_ITALIAN:
-		sprintf(filename, "ITALIAN.GXT");
-		break;
-	case LANGUAGE_SPANISH:
-		sprintf(filename, "SPANISH.GXT");
-		break;
-	}
-
-	length = CFileMgr::LoadFile(filename, filedata, 0x40000, "rb");
-	CFileMgr::SetDir("");
-
-	offset = 0;
-	while(offset < length){
-		type[0] = filedata[offset++];
-		type[1] = filedata[offset++];
-		type[2] = filedata[offset++];
-		type[3] = filedata[offset++];
-		sectlen = (int)filedata[offset+3]<<24 | (int)filedata[offset+2]<<16 |
-			(int)filedata[offset+1]<<8 | (int)filedata[offset+0];
-		offset += 4;
-		if(sectlen != 0){
-			if(strncmp(type, "TKEY", 4) == 0)
-				keyArray.Load(sectlen, filedata, &offset);
-			else if(strncmp(type, "TDAT", 4) == 0)
-				data.Load(sectlen, filedata, &offset);
-			else
-				offset += sectlen;
-		}
-	}
-
-	keyArray.Update(data.chars);
-
-	delete[] filedata;
-}
-
-void
-CText::Unload(void)
-{
-	CMessages::ClearAllMessagesDisplayedByGame();
-	data.Unload();
-	keyArray.Unload();
-}
-
-wchar*
-CText::Get(const char *key)
-{
-	return keyArray.Search(key);
-}
-
-wchar UpperCaseTable[128] = {
+#include "common.h"

+#include "patcher.h"

+#include "FileMgr.h"

+#include "Frontend.h"

+#include "Messages.h"

+#include "Text.h"

+

+static wchar WideErrorString[25];

+

+CText &TheText = *(CText*)0x941520;

+

+CText::CText(void)

+{

+	encoding = 'e';

+	memset(WideErrorString, 0, sizeof(WideErrorString));

+}

+

+void

+CText::Load(void)

+{

+	uint8 *filedata;

+	char filename[32], type[4];

+	int length;

+	int offset, sectlen;

+

+	Unload();

+	filedata = new uint8[0x40000];

+

+	CFileMgr::SetDir("TEXT");

+	switch(CMenuManager::m_PrefsLanguage){

+	case LANGUAGE_AMERICAN:

+		sprintf(filename, "AMERICAN.GXT");

+		break;

+	case LANGUAGE_FRENCH:

+		sprintf(filename, "FRENCH.GXT");

+		break;

+	case LANGUAGE_GERMAN:

+		sprintf(filename, "GERMAN.GXT");

+		break;

+	case LANGUAGE_ITALIAN:

+		sprintf(filename, "ITALIAN.GXT");

+		break;

+	case LANGUAGE_SPANISH:

+		sprintf(filename, "SPANISH.GXT");

+		break;

+	}

+

+	length = CFileMgr::LoadFile(filename, filedata, 0x40000, "rb");

+	CFileMgr::SetDir("");

+

+	offset = 0;

+	while(offset < length){

+		type[0] = filedata[offset++];

+		type[1] = filedata[offset++];

+		type[2] = filedata[offset++];

+		type[3] = filedata[offset++];

+		sectlen = (int)filedata[offset+3]<<24 | (int)filedata[offset+2]<<16 |

+			(int)filedata[offset+1]<<8 | (int)filedata[offset+0];

+		offset += 4;

+		if(sectlen != 0){

+			if(strncmp(type, "TKEY", 4) == 0)

+				keyArray.Load(sectlen, filedata, &offset);

+			else if(strncmp(type, "TDAT", 4) == 0)

+				data.Load(sectlen, filedata, &offset);

+			else

+				offset += sectlen;

+		}

+	}

+

+	keyArray.Update(data.chars);

+

+	delete[] filedata;

+}

+

+void

+CText::Unload(void)

+{

+	CMessages::ClearAllMessagesDisplayedByGame();

+	data.Unload();

+	keyArray.Unload();

+}

+

+wchar*

+CText::Get(const char *key)

+{

+	return keyArray.Search(key);

+}

+

+wchar UpperCaseTable[128] = {

 	128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,

 	139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,

 	150, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,

@@ -98,10 +98,10 @@ wchar UpperCaseTable[128] = {
 	216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,

 	227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,

 	238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248,

-	249, 250, 251, 252, 253, 254, 255
-};
-
-wchar FrenchUpperCaseTable[128] = {
+	249, 250, 251, 252, 253, 254, 255

+};

+

+wchar FrenchUpperCaseTable[128] = {

 	128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,

 	139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,

 	150, 65, 65, 65, 65, 132, 133, 69, 69, 69, 69, 73, 73,

@@ -113,11 +113,11 @@ wchar FrenchUpperCaseTable[128] = {
 	220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230,

 	231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,

 	242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,

-	253, 254, 255
-};
-
-wchar
-CText::GetUpperCase(wchar c)
+	253, 254, 255

+};

+

+wchar

+CText::GetUpperCase(wchar c)

 {

 	switch (encoding)

 	{

@@ -144,176 +144,176 @@ CText::GetUpperCase(wchar c)
 	default:

 		break;

 	}

-	return c;
-}
-
-void
-CText::UpperCase(wchar *s)
-{
-	while(*s){
-		*s = GetUpperCase(*s);
-		s++;
-	}
-}
-
-
-void
-CKeyArray::Load(uint32 length, uint8 *data, int *offset)
-{
-	uint32 i;
-	uint8 *rawbytes;
-
-	numEntries = length / sizeof(CKeyEntry);
-	entries = new CKeyEntry[numEntries];
-	rawbytes = (uint8*)entries;
-
-	for(i = 0; i < length; i++)
-		rawbytes[i] = data[(*offset)++];
-}
-
-void
-CKeyArray::Unload(void)
-{
-	delete[] entries;
-	entries = nil;
-	numEntries = 0;
-}
-
-void
-CKeyArray::Update(wchar *chars)
-{
-	int i;
-	for(i = 0; i < numEntries; i++)
-		entries[i].value = (wchar*)((uint8*)chars + (uintptr)entries[i].value);
-}
-
-CKeyEntry*
-CKeyArray::BinarySearch(const char *key, CKeyEntry *entries, int16 low, int16 high)
-{
-	int mid;
-	int diff;
-
-	if(low > high)
-		return nil;
-
-	mid = (low + high)/2;
-	diff = strcmp(key, entries[mid].key);
-	if(diff == 0)
-		return &entries[mid];
-	if(diff < 0)
-		return BinarySearch(key, entries, low, mid-1);
-	if(diff > 0)
-		return BinarySearch(key, entries, mid+1, high);
-	return nil;
-}
-
-wchar*
-CKeyArray::Search(const char *key)
-{
-	CKeyEntry *found;
-	char errstr[25];
-	int i;
-
-	found = BinarySearch(key, entries, 0, numEntries-1);
-	if(found)
-		return found->value;
-	sprintf(errstr, "%s missing", key);
-	for(i = 0; i < 25; i++)
-		WideErrorString[i] = errstr[i];
-	return WideErrorString;
-}
-
-
-void
-CData::Load(uint32 length, uint8 *data, int *offset)
-{
-	uint32 i;
-	uint8 *rawbytes;
-
-	numChars = length / sizeof(wchar);
-	chars = new wchar[numChars];
-	rawbytes = (uint8*)chars;
-
-	for(i = 0; i < length; i++)
-		rawbytes[i] = data[(*offset)++];
-}
-
-void
-CData::Unload(void)
-{
-	delete[] chars;
-	chars = nil;
-	numChars = 0;
-}
-
-void
-AsciiToUnicode(const char *src, wchar *dst)
-{
-	while((*dst++ = *src++) != '\0');
-}
-
-char*
-UnicodeToAscii(wchar *src)
-{
-	static char aStr[256];
-	int len;
-	for(len = 0; *src != '\0' && len < 256-1; len++, src++)
-		if(*src < 128)
-			aStr[len] = *src;
-		else
-			aStr[len] = '#';
-	aStr[len] = '\0';
-	return aStr;
-}
-
-char*
-UnicodeToAsciiForSaveLoad(wchar *src)
-{
-	static char aStr[256];
-	int len;
-	for(len = 0; *src != '\0' && len < 256-1; len++, src++)
-		if(*src < 256)
-			aStr[len] = *src;
-		else
-			aStr[len] = '#';
-	aStr[len] = '\0';
-	return aStr;
-}
-
-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;
-}
-
-void
-TextCopy(wchar *dst, const wchar *src)
-{
-	while((*dst++ = *src++) != '\0');
-}
-
-
-STARTPATCHES
-	InjectHook(0x52C3C0, &CText::Load, PATCH_JUMP);
-	InjectHook(0x52C580, &CText::Unload, PATCH_JUMP);
-	InjectHook(0x52C5A0, &CText::Get, PATCH_JUMP);
-	InjectHook(0x52C220, &CText::GetUpperCase, PATCH_JUMP);
-	InjectHook(0x52C2C0, &CText::UpperCase, PATCH_JUMP);
-
-	InjectHook(0x52BE70, &CKeyArray::Load, PATCH_JUMP);
-	InjectHook(0x52BF60, &CKeyArray::Unload, PATCH_JUMP);
-	InjectHook(0x52BF80, &CKeyArray::Update, PATCH_JUMP);
-	InjectHook(0x52C060, &CKeyArray::BinarySearch, PATCH_JUMP);
-	InjectHook(0x52BFB0, &CKeyArray::Search, PATCH_JUMP);
-
-	InjectHook(0x52C120, &CData::Load, PATCH_JUMP);
-	InjectHook(0x52C200, &CData::Unload, PATCH_JUMP);
-ENDPATCHES
+	return c;

+}

+

+void

+CText::UpperCase(wchar *s)

+{

+	while(*s){

+		*s = GetUpperCase(*s);

+		s++;

+	}

+}

+

+

+void

+CKeyArray::Load(uint32 length, uint8 *data, int *offset)

+{

+	uint32 i;

+	uint8 *rawbytes;

+

+	numEntries = length / sizeof(CKeyEntry);

+	entries = new CKeyEntry[numEntries];

+	rawbytes = (uint8*)entries;

+

+	for(i = 0; i < length; i++)

+		rawbytes[i] = data[(*offset)++];

+}

+

+void

+CKeyArray::Unload(void)

+{

+	delete[] entries;

+	entries = nil;

+	numEntries = 0;

+}

+

+void

+CKeyArray::Update(wchar *chars)

+{

+	int i;

+	for(i = 0; i < numEntries; i++)

+		entries[i].value = (wchar*)((uint8*)chars + (uintptr)entries[i].value);

+}

+

+CKeyEntry*

+CKeyArray::BinarySearch(const char *key, CKeyEntry *entries, int16 low, int16 high)

+{

+	int mid;

+	int diff;

+

+	if(low > high)

+		return nil;

+

+	mid = (low + high)/2;

+	diff = strcmp(key, entries[mid].key);

+	if(diff == 0)

+		return &entries[mid];

+	if(diff < 0)

+		return BinarySearch(key, entries, low, mid-1);

+	if(diff > 0)

+		return BinarySearch(key, entries, mid+1, high);

+	return nil;

+}

+

+wchar*

+CKeyArray::Search(const char *key)

+{

+	CKeyEntry *found;

+	char errstr[25];

+	int i;

+

+	found = BinarySearch(key, entries, 0, numEntries-1);

+	if(found)

+		return found->value;

+	sprintf(errstr, "%s missing", key);

+	for(i = 0; i < 25; i++)

+		WideErrorString[i] = errstr[i];

+	return WideErrorString;

+}

+

+

+void

+CData::Load(uint32 length, uint8 *data, int *offset)

+{

+	uint32 i;

+	uint8 *rawbytes;

+

+	numChars = length / sizeof(wchar);

+	chars = new wchar[numChars];

+	rawbytes = (uint8*)chars;

+

+	for(i = 0; i < length; i++)

+		rawbytes[i] = data[(*offset)++];

+}

+

+void

+CData::Unload(void)

+{

+	delete[] chars;

+	chars = nil;

+	numChars = 0;

+}

+

+void

+AsciiToUnicode(const char *src, wchar *dst)

+{

+	while((*dst++ = *src++) != '\0');

+}

+

+char*

+UnicodeToAscii(wchar *src)

+{

+	static char aStr[256];

+	int len;

+	for(len = 0; *src != '\0' && len < 256-1; len++, src++)

+		if(*src < 128)

+			aStr[len] = *src;

+		else

+			aStr[len] = '#';

+	aStr[len] = '\0';

+	return aStr;

+}

+

+char*

+UnicodeToAsciiForSaveLoad(wchar *src)

+{

+	static char aStr[256];

+	int len;

+	for(len = 0; *src != '\0' && len < 256-1; len++, src++)

+		if(*src < 256)

+			aStr[len] = *src;

+		else

+			aStr[len] = '#';

+	aStr[len] = '\0';

+	return aStr;

+}

+

+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;

+}

+

+void

+TextCopy(wchar *dst, const wchar *src)

+{

+	while((*dst++ = *src++) != '\0');

+}

+

+

+STARTPATCHES

+	InjectHook(0x52C3C0, &CText::Load, PATCH_JUMP);

+	InjectHook(0x52C580, &CText::Unload, PATCH_JUMP);

+	InjectHook(0x52C5A0, &CText::Get, PATCH_JUMP);

+	InjectHook(0x52C220, &CText::GetUpperCase, PATCH_JUMP);

+	InjectHook(0x52C2C0, &CText::UpperCase, PATCH_JUMP);

+

+	InjectHook(0x52BE70, &CKeyArray::Load, PATCH_JUMP);

+	InjectHook(0x52BF60, &CKeyArray::Unload, PATCH_JUMP);

+	InjectHook(0x52BF80, &CKeyArray::Update, PATCH_JUMP);

+	InjectHook(0x52C060, &CKeyArray::BinarySearch, PATCH_JUMP);

+	InjectHook(0x52BFB0, &CKeyArray::Search, PATCH_JUMP);

+

+	InjectHook(0x52C120, &CData::Load, PATCH_JUMP);

+	InjectHook(0x52C200, &CData::Unload, PATCH_JUMP);

+ENDPATCHES