Merge branch 'master' into MoreLanguages

# Conflicts:
#	src/core/Frontend.cpp
#	src/core/MenuScreens.h
#	src/render/Font.cpp
#	src/render/Font.h
#	src/text/Messages.cpp
#	src/text/Text.cpp

1 files changed, 6 insertions, 20 deletions

diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index ca98c2a5..117ba9cf 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -1,5 +1,5 @@
 #include "common.h"

-#include "patcher.h"

+

 #include "FileMgr.h"

 #include "Frontend.h"

 #include "Messages.h"

@@ -7,7 +7,7 @@
 

 static wchar WideErrorString[25];

 

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

+CText TheText;

 

 CText::CText(void)

 {

@@ -44,6 +44,9 @@ CText::Load(void)
 		sprintf(filename, "SPANISH.GXT");

 		break;

 #ifdef MORE_LANGUAGES

+	case LANGUAGE_POLISH:

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

+		break;

 	case LANGUAGE_RUSSIAN:

 		sprintf(filename, "RUSSIAN.GXT");

 		break;

@@ -311,21 +314,4 @@ TextCopy(wchar *dst, const wchar *src)
 }

 

 

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

-

-	InjectHook(0x52C2F0, &UnicodeToAscii, PATCH_JUMP);

-ENDPATCHES

+	InjectHook(0x52C2F0, &UnicodeToAscii, PATCH_JUMP);
\ No newline at end of file