9 files changed, 697 insertions, 515 deletions

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 0bade6c7..a002835b 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1707,6 +1707,17 @@ void CMenuManager::InitialiseChangedLanguageSettings()
 		CTimer::Update();
 		CGame::frenchGame = false;
 		CGame::germanGame = false;
+#ifdef MORE_LANGUAGES
+		switch (CMenuManager::m_PrefsLanguage) {
+		case LANGUAGE_RUSSIAN:
+			CFont::ReloadFonts(FONT_LANGSET_RUSSIAN);
+			break;
+		default:
+			CFont::ReloadFonts(FONT_LANGSET_EFIGS);
+			break;
+		}
+#endif
+
 		switch (CMenuManager::m_PrefsLanguage) {
 		case LANGUAGE_FRENCH:
 			CGame::frenchGame = true;
@@ -1714,6 +1725,11 @@ void CMenuManager::InitialiseChangedLanguageSettings()
 		case LANGUAGE_GERMAN:
 			CGame::germanGame = true;
 			break;
+#ifdef MORE_LANGUAGES
+		case LANGUAGE_RUSSIAN:
+			CGame::russianGame = true;
+			break;
+#endif
 		default:
 			break;
 		}
@@ -2916,6 +2932,14 @@ CMenuManager::ProcessButtonPresses(void)
 					CMenuManager::InitialiseChangedLanguageSettings();
 					SaveSettings();
 					break;
+#ifdef MORE_LANGUAGES
+				case MENUACTION_LANG_RUS:
+					m_PrefsLanguage = LANGUAGE_RUSSIAN;
+					m_bFrontEnd_ReloadObrTxtGxt = true;
+					CMenuManager::InitialiseChangedLanguageSettings();
+					SaveSettings();
+					break;
+#endif
 				case MENUACTION_POPULATESLOTS_CHANGEMENU:
 					PcSaveHelper.PopulateSlotInfo();
 
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index 3dbed164..c055c6ab 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -51,6 +51,9 @@ enum eLanguages
 	LANGUAGE_GERMAN,
 	LANGUAGE_ITALIAN,
 	LANGUAGE_SPANISH,
+#ifdef MORE_LANGUAGES
+	LANGUAGE_RUSSIAN,
+#endif
 };
 
 enum eFrontendSprites
@@ -301,6 +304,9 @@ enum eMenuAction
 	MENUACTION_UNK108,
 	MENUACTION_UNK109,
 	MENUACTION_UNK110,
+#ifdef MORE_LANGUAGES
+	MENUACTION_LANG_RUS,
+#endif
 };
 
 enum eCheckHover
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index fce0c67f..3170ab6c 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -78,6 +78,9 @@ bool &CGame::germanGame = *(bool*)0x95CD1E;
 bool &CGame::noProstitutes = *(bool*)0x95CDCF;
 bool &CGame::playingIntro = *(bool*)0x95CDC2;
 char *CGame::aDatFile = (char*)0x773A48;
+#ifdef MORE_LANGUAGES
+bool CGame::russianGame = false;
+#endif
 
 
 bool
diff --git a/src/core/Game.h b/src/core/Game.h
index 7b20099c..991c8718 100644
--- a/src/core/Game.h
+++ b/src/core/Game.h
@@ -16,6 +16,9 @@ public:
 	static bool &nastyGame;
 	static bool &frenchGame;
 	static bool &germanGame;
+#ifdef MORE_LANGUAGES
+	static bool russianGame;
+#endif
 	static bool &noProstitutes;
 	static bool &playingIntro;
 	static char *aDatFile;	//[32];
diff --git a/src/core/MenuScreens.h b/src/core/MenuScreens.h
index 427d01bf..ace6a719 100644
--- a/src/core/MenuScreens.h
+++ b/src/core/MenuScreens.h
@@ -65,6 +65,9 @@ const CMenuScreen aScreens[] = {
 		MENUACTION_LANG_GER,	"FEL_GER", SAVESLOT_NONE, MENUPAGE_NONE,
 		MENUACTION_LANG_ITA,	"FEL_ITA", SAVESLOT_NONE, MENUPAGE_NONE,
 		MENUACTION_LANG_SPA,	"FEL_SPA", SAVESLOT_NONE, MENUPAGE_NONE,
+#ifdef MORE_LANGUAGES
+		MENUACTION_LANG_RUS,	"FEL_RUS", SAVESLOT_NONE, MENUPAGE_NONE,
+#endif
 		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
 	},
 
diff --git a/src/core/config.h b/src/core/config.h
index ba00992a..4015e868 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -172,6 +172,7 @@ enum Config {
 
 #define FIX_BUGS		// fixes bugs that we've came across during reversing, TODO: use this more
 #define TOGGLEABLE_BETA_FEATURES // toggleable from debug menu. not too many things
+#define MORE_LANGUAGES		// Add more translations to the game
 
 // Pad
 #define XINPUT
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index d7b4b5d8..0d79eee3 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -1,515 +1,636 @@
-#include "common.h"
-#include "patcher.h"
-#include "Sprite2d.h"
-#include "TxdStore.h"
-#include "Font.h"
-
-CFontDetails &CFont::Details = *(CFontDetails*)0x8F317C;
-int16 &CFont::NewLine = *(int16*)0x95CC94;
-CSprite2d *CFont::Sprite = (CSprite2d*)0x95CC04;
-
-int16 CFont::Size[3][193] = {
-	{
-	13, 12, 31, 35, 23, 35, 31,  9, 14, 15, 25, 30, 11, 17, 13, 31,
-	23, 16, 22, 21, 24, 23, 23, 20, 23, 22, 10, 35, 26, 26, 26, 26,
-	30, 26, 24, 23, 24, 22, 21, 24, 26, 10, 20, 26, 22, 29, 26, 25,
-	23, 25, 24, 24, 22, 25, 24, 29, 29, 23, 25, 37, 22, 37, 35, 37,
-	35, 21, 22, 21, 21, 22, 13, 22, 21, 10, 16, 22, 11, 32, 21, 21,
-	23, 22, 16, 20, 14, 21, 20, 30, 25, 21, 21, 33, 33, 33, 33, 35,
-	27, 27, 27, 27, 32, 24, 23, 23, 23, 23, 11, 11, 11, 11, 26, 26,
-	26, 26, 26, 26, 26, 25, 26, 21, 21, 21, 21, 32, 23, 22, 22, 22,
-	22, 11, 11, 11, 11, 22, 22, 22, 22, 22, 22, 22, 22, 26, 21, 24,
-	12, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-	26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 18, 26, 26,
-	26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-	20
-	},
-
-	{
-	13,  9, 21, 35, 23, 35, 35, 11, 35, 35, 25, 35, 11, 17, 13, 33,
-	28, 14, 22, 21, 24, 23, 23, 21, 23, 22, 10, 35, 13, 35, 13, 33,
-	 5, 25, 22, 23, 24, 21, 21, 24, 24,  9, 20, 24, 21, 27, 25, 25,
-	22, 25, 23, 20, 23, 23, 23, 31, 23, 23, 23, 37, 33, 37, 35, 37,
-	35, 21, 19, 19, 21, 19, 17, 21, 21,  8, 17, 18, 14, 24, 21, 21,
-	20, 22, 19, 20, 20, 19, 20, 26, 21, 20, 21, 33, 33, 33, 33, 35,
-	19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	16
-	},
-
-	{
-	15, 14, 16, 25, 19, 26, 22, 11, 18, 18, 27, 26, 13, 19,  9, 27,
-	19, 18, 19, 19, 22, 19, 20, 18, 19, 20, 12, 32, 15, 32, 15, 35,
-	15, 19, 19, 19, 19, 19, 16, 19, 20,  9, 19, 20, 14, 29, 19, 20,
-	19, 19, 19, 19, 21, 19, 20, 32, 20, 19, 19, 33, 31, 39, 37, 39,
-	37, 21, 21, 21, 23, 21, 19, 23, 23, 10, 19, 20, 16, 26, 23, 23,
-	20, 20, 20, 22, 21, 22, 22, 26, 22, 22, 23, 35, 35, 35, 35, 37,
-	19, 19, 19, 19, 29, 19, 19, 19, 19, 19,  9,  9,  9,  9, 19, 19,
-	19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 30, 19, 19, 19, 19,
-	19, 10, 10, 10, 10, 19, 19, 19, 19, 19, 19, 19, 19, 19, 23, 35,
-	12, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 11, 19, 19,
-	19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-	19
-	}
-};
-
-uint16 foreign_table[128] = {
-	  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-	  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-	  0, 176,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-	  0,   0,   0,   0, 177,   0,   0,   0,   0,   0,  95,   0,   0,   0,   0, 175,
-	128, 129, 130,   0, 131,   0, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
-	  0, 173, 142, 143, 144,   0, 145,   0,   0, 146, 147, 148, 149,   0,   0, 150,
-	151, 152, 153,   0, 154,   0, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
-	  0, 174, 165, 166, 167,   0, 168,   0,   0, 169, 170, 171, 172,   0,   0,   0,
-};
-
-void
-CFont::Initialise(void)
-{
-	int slot;
-
-	slot = CTxdStore::AddTxdSlot("fonts");
-	CTxdStore::LoadTxd(slot, "MODELS/FONTS.TXD");
-	CTxdStore::AddRef(slot);
-	CTxdStore::PushCurrentTxd();
-	CTxdStore::SetCurrentTxd(slot);
-	Sprite[0].SetTexture("font2", "font2_mask");
-	Sprite[1].SetTexture("pager", "pager_mask");
-	Sprite[2].SetTexture("font1", "font1_mask");
-	SetScale(1.0f, 1.0f);
-	SetSlantRefPoint(SCREEN_WIDTH, 0.0f);
-	SetSlant(0.0f);
-	SetColor(CRGBA(0xFF, 0xFF, 0xFF, 0));
-	SetJustifyOff();
-	SetCentreOff();
-	SetWrapx(640.0f);
-	SetCentreSize(640.0f);
-	SetBackgroundOff();
-	SetBackgroundColor(CRGBA(0x80, 0x80, 0x80, 0x80));
-	SetBackGroundOnlyTextOff();
-	SetPropOn();
-	SetFontStyle(FONT_BANK);
-	SetRightJustifyWrap(0.0f);
-	SetAlphaFade(255.0f);
-	SetDropShadowPosition(0);
-	CTxdStore::PopCurrentTxd();
-}
-
-void
-CFont::Shutdown(void)
-{
-	Sprite[0].Delete();
-	Sprite[1].Delete();
-	Sprite[2].Delete();
-	CTxdStore::RemoveTxdSlot(CTxdStore::FindTxdSlot("fonts"));
-}
-
-void
-CFont::InitPerFrame(void)
-{
-	Details.bank = CSprite2d::GetBank(30, Sprite[0].m_pTexture);
-	CSprite2d::GetBank(15, Sprite[1].m_pTexture);
-	CSprite2d::GetBank(15, Sprite[2].m_pTexture);
-	SetDropShadowPosition(0);
-	NewLine = 0;
-}
-
-void
-CFont::PrintChar(float x, float y, uint16 c)
-{
-	if(x <= 0.0f || x > SCREEN_WIDTH ||
-	   y <= 0.0f || y > SCREEN_HEIGHT)	// BUG: game uses SCREENW again
-		return;
-
-	float w = GetCharacterWidth(c) / 32.0f;
-	float xoff = c & 0xF;
-	float yoff = c >> 4;
-
-	if(Details.style == FONT_BANK || Details.style == FONT_HEADING){
-		if(Details.dropShadowPosition != 0){
-			CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank
-				CRect(x + SCREEN_SCALE_X(Details.dropShadowPosition),
-				      y + SCREEN_SCALE_Y(Details.dropShadowPosition),
-				      x + SCREEN_SCALE_X(Details.dropShadowPosition) + 32.0f * Details.scaleX * 1.0f,
-				      y + SCREEN_SCALE_Y(Details.dropShadowPosition) + 40.0f * Details.scaleY * 0.5f),
-				Details.dropColor,
-				xoff/16.0f,                 yoff/12.8f,
-				(xoff+1.0f)/16.0f - 0.001f, yoff/12.8f,
-				xoff/16.0f,                 (yoff+1.0f)/12.8f,
-				(xoff+1.0f)/16.0f - 0.001f, (yoff+1.0f)/12.8f - 0.0001f);
-		}
-		CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank
-			CRect(x, y,
-			      x + 32.0f * Details.scaleX * 1.0f,
-			      y + 40.0f * Details.scaleY * 0.5f),
-			Details.color,
-			xoff/16.0f,                 yoff/12.8f,
-			(xoff+1.0f)/16.0f - 0.001f, yoff/12.8f,
-			xoff/16.0f,                 (yoff+1.0f)/12.8f - 0.002f,
-			(xoff+1.0f)/16.0f - 0.001f, (yoff+1.0f)/12.8f - 0.002f);
-	}else{
-		CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank
-			CRect(x, y,
-			      x + 32.0f * Details.scaleX * w,
-			      y + 32.0f * Details.scaleY * 0.5f),
-			Details.color,
-			xoff/16.0f,               yoff/16.0f,
-			(xoff+w)/16.0f,           yoff/16.0f,
-			xoff/16.0f,               (yoff+1.0f)/16.0f,
-			(xoff+w)/16.0f - 0.0001f, (yoff+1.0f)/16.0f - 0.0001f);
-	}
-}
-
-void
-CFont::PrintString(float xstart, float ystart, uint16 *s)
-{
-	CRect rect;
-	int numSpaces;
-	float lineLength;
-	float x, y;
-	bool first;
-	uint16 *start, *t;
-
-	if(*s == '*')
-		return;
-
-	if(Details.background){
-		GetNumberLines(xstart, ystart, s);	// BUG: result not used
-		GetTextRect(&rect, xstart, ystart, s);
-		CSprite2d::DrawRect(rect, Details.backgroundColor);
-	}
-
-	lineLength = 0.0f;
-	numSpaces = 0;
-	first = true;
-	if(Details.centre || Details.rightJustify)
-		x = 0.0f;
-	else
-		x = xstart;
-	y = ystart;
-	start = s;
-
-	// This is super ugly, I blame R*
-	for(;;){
-		for(;;){
-			for(;;){
-				if(*s == '\0')
-					return;
-				int xend = Details.centre ? Details.centreSize :
-				           Details.rightJustify ? xstart - Details.rightJustifyWrap :
-				           Details.wrapX;
-				if(x + GetStringWidth(s) > xend && !first){
-					// flush line
-					float spaceWidth = !Details.justify || Details.centre ? 0.0f :
-						(Details.wrapX - lineLength) / numSpaces;
-					float xleft = Details.centre ? xstart - x/2 :
-					              Details.rightJustify ? xstart - x :
-					              xstart;
-					PrintString(xleft, y, start, s, spaceWidth);
-					// reset things
-					lineLength = 0.0f;
-					numSpaces = 0;
-					first = true;
-					if(Details.centre || Details.rightJustify)
-						x = 0.0f;
-					else
-						x = xstart;
-					y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY;
-					start = s;
-				}else
-					break;
-			}
-			// advance by one word
-			t = GetNextSpace(s);
-			if(t[0] == '\0' ||
-			   t[0] == ' ' && t[1] == '\0')
-				break;
-			if(!first)
-				numSpaces++;
-			first = false;
-			x += GetStringWidth(s) + GetCharacterSize(*t - ' ');
-			lineLength = x;
-			s = t+1;
-		}
-		// print rest
-		if(t[0] == ' ' && t[1] == '\0')
-			t[0] = '\0';
-		x += GetStringWidth(s);
-		s = t;
-		float xleft = Details.centre ? xstart - x/2 :
-		              Details.rightJustify ? xstart - x :
-		              xstart;
-		PrintString(xleft, y, start, s, 0.0f);
-	}
-}
-
-int
-CFont::GetNumberLines(float xstart, float ystart, uint16 *s)
-{
-	int n;
-	float x, y;
-	uint16 *t;
-
-	n = 0;
-	if(Details.centre || Details.rightJustify)
-		x = 0.0f;
-	else
-		x = xstart;
-	y = ystart;
-
-	while(*s){
-		if(x + GetStringWidth(s) > (Details.centre ? Details.centreSize : Details.wrapX)){
-			// reached end of line
-			if(Details.centre || Details.rightJustify)
-				x = 0.0f;
-			else
-				x = xstart;
-			n++;
-			// Why even?
-			y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY;
-		}else{
-			// still space in current line
-			t = GetNextSpace(s);
-			if(*t == '\0'){
-				// end of string
-				x += GetStringWidth(s);
-				n++;
-				s = t;
-			}else{
-				x += GetStringWidth(s);
-				x += GetCharacterSize(*t - ' ');
-				s = t+1;
-			}
-		}
-	}
-
-	return n;
-}
-
-void
-CFont::GetTextRect(CRect *rect, float xstart, float ystart, uint16 *s)
-{
-	int numLines;
-	float x, y;
-	int16 maxlength;
-	uint16 *t;
-
-	maxlength = 0;
-	numLines = 0;
-	if(Details.centre || Details.rightJustify)
-		x = 0.0f;
-	else
-		x = xstart;
-	y = ystart;
-
-	while(*s){
-		if(x + GetStringWidth(s) > (Details.centre ? Details.centreSize : Details.wrapX)){
-			// reached end of line
-			if(x > maxlength)
-				maxlength = x;
-			if(Details.centre || Details.rightJustify)
-				x = 0.0f;
-			else
-				x = xstart;
-			numLines++;
-			y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY;
-		}else{
-			// still space in current line
-			t = GetNextSpace(s);
-			if(*t == '\0'){
-				// end of string
-				x += GetStringWidth(s);
-				if(x > maxlength)
-					maxlength = x;
-				numLines++;
-				s = t;
-			}else{
-				x += GetStringWidth(s);
-				x += GetCharacterSize(*t - ' ');
-				s = t+1;
-			}
-		}
-	}
-
-	if(Details.centre){
-		if(Details.backgroundOnlyText){
-			rect->left = xstart - maxlength/2 - 4.0f;
-			rect->right = xstart + maxlength/2 + 4.0f;
-			rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines +
-				ystart + 2.0f;
-			rect->top = ystart - 2.0f;
-		}else{
-			rect->left = xstart - Details.centreSize*0.5f - 4.0f;
-			rect->right = xstart + Details.centreSize*0.5f + 4.0f;
-			rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines +
-				ystart + 2.0f;
-			rect->top = ystart - 2.0f;
-		}
-	}else{
-		rect->left = xstart - 4.0f;
-		rect->right = Details.wrapX;
-		// WTF?
-		rect->bottom = ystart - 4.0f + 4.0f;
-		rect->top = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines +
-				ystart + 2.0f + 2.0f;
-	}
-}
-
-void
-CFont::PrintString(float x, float y, uint16 *start, uint16 *end, float spwidth)
-{
-	uint16 *s, c, unused;
-
-	for(s = start; s < end; s++){
-		if(*s == '~')
-			s = ParseToken(s, &unused);
-		c = *s - ' ';
-		if(Details.slant != 0.0f)
-			y = (Details.slantRefX - x)*Details.slant + Details.slantRefY;
-		PrintChar(x, y, c);
-		x += GetCharacterSize(c);
-		if(c == 0)	// space
-			x += spwidth;
-	}
-}
-
-float
-CFont::GetCharacterWidth(uint16 c)
-{
-	if(Details.proportional)
-		return Size[Details.style][c];
-	else
-		return Size[Details.style][192];
-}
-
-float
-CFont::GetCharacterSize(uint16 c)
-{
-	if(Details.proportional)
-		return Size[Details.style][c] * Details.scaleX;
-	else
-		return Size[Details.style][192] * Details.scaleX;
-}
-
-float
-CFont::GetStringWidth(uint16 *s, bool spaces)
-{
-	float w;
-
-	w = 0.0f;
-	for(; (*s != ' ' || spaces) && *s != '\0'; s++){
-		if(*s == '~'){
-			s++;
-			while(*s != '~') s++;
-			s++;
-			if(*s == ' ' && !spaces)
-				break;
-		}
-		w += GetCharacterSize(*s - ' ');
-	}
-	return w;
-}
-
-uint16*
-CFont::GetNextSpace(uint16 *s)
-{
-	for(; *s != ' ' && *s != '\0'; s++)
-		if(*s == '~'){
-			s++;
-			while(*s != '~') s++;
-			s++;
-			if(*s == ' ')
-				break;
-		}
-	return s;
-}
-
-uint16*
-CFont::ParseToken(uint16 *s, uint16*)
-{
-	s++;
-	if(Details.color.r || Details.color.g || Details.color.b)
-		switch(*s){
-		case 'N':
-		case 'n':
-			NewLine = 1;
-			break;
-		case 'b': SetColor(CRGBA(0x80, 0xA7, 0xF3, 0xFF)); break;
-		case 'g': SetColor(CRGBA(0x5F, 0xA0, 0x6A, 0xFF)); break;
-		case 'h': SetColor(CRGBA(0xE1, 0xE1, 0xE1, 0xFF)); break;
-		case 'l': SetColor(CRGBA(0x00, 0x00, 0x00, 0xFF)); break;
-		case 'p': SetColor(CRGBA(0xA8, 0x6E, 0xFC, 0xFF)); break;
-		case 'r': SetColor(CRGBA(0x71, 0x2B, 0x49, 0xFF)); break;
-		case 'w': SetColor(CRGBA(0xAF, 0xAF, 0xAF, 0xFF)); break;
-		case 'y': SetColor(CRGBA(0xD2, 0xC4, 0x6A, 0xFF)); break;
-		}
-	while(*s != '~') s++;
-	return s+1;
-}
-
-void
-CFont::DrawFonts(void)
-{
-	CSprite2d::DrawBank(Details.bank);
-	CSprite2d::DrawBank(Details.bank+1);
-	CSprite2d::DrawBank(Details.bank+2);
-}
-
-uint16
-CFont::character_code(uint8 c)
-{
-	if(c < 128)
-		return c;
-	return foreign_table[c-128];
-}
-
-STARTPATCHES
-
-	InjectHook(0x500A40, CFont::Initialise, PATCH_JUMP);
-	InjectHook(0x500BA0, CFont::Shutdown, PATCH_JUMP);
-	InjectHook(0x500BE0, CFont::InitPerFrame, PATCH_JUMP);
-	InjectHook(0x500C30, CFont::PrintChar, PATCH_JUMP);
-	InjectHook(0x500F50, (void (*)(float, float, uint16*))CFont::PrintString, PATCH_JUMP);
-	InjectHook(0x501260, CFont::GetNumberLines, PATCH_JUMP);
-	InjectHook(0x5013B0, CFont::GetTextRect, PATCH_JUMP);
-	InjectHook(0x501730, (void (*)(float, float, uint16*, uint16*, float))CFont::PrintString, PATCH_JUMP);
-	InjectHook(0x5017E0, CFont::GetCharacterWidth, PATCH_JUMP);
-	InjectHook(0x501840, CFont::GetCharacterSize, PATCH_JUMP);
-	InjectHook(0x5018A0, CFont::GetStringWidth, PATCH_JUMP);
-	InjectHook(0x501960, CFont::GetNextSpace, PATCH_JUMP);
-	InjectHook(0x5019A0, CFont::ParseToken, PATCH_JUMP);
-	InjectHook(0x501B50, CFont::DrawFonts, PATCH_JUMP);
-	InjectHook(0x501E80, CFont::character_code, PATCH_JUMP);
-
-	InjectHook(0x501B80, CFont::SetScale, PATCH_JUMP);
-	InjectHook(0x501BA0, CFont::SetSlantRefPoint, PATCH_JUMP);
-	InjectHook(0x501BC0, CFont::SetSlant, PATCH_JUMP);
-	InjectHook(0x501BD0, CFont::SetColor, PATCH_JUMP);
-	InjectHook(0x501C60, CFont::SetJustifyOn, PATCH_JUMP);
-	InjectHook(0x501C80, CFont::SetJustifyOff, PATCH_JUMP);
-	InjectHook(0x501C90, CFont::SetCentreOn, PATCH_JUMP);
-	InjectHook(0x501CB0, CFont::SetCentreOff, PATCH_JUMP);
-	InjectHook(0x501CC0, CFont::SetWrapx, PATCH_JUMP);
-	InjectHook(0x501CD0, CFont::SetCentreSize, PATCH_JUMP);
-	InjectHook(0x501CE0, CFont::SetBackgroundOn, PATCH_JUMP);
-	InjectHook(0x501CF0, CFont::SetBackgroundOff, PATCH_JUMP);
-	InjectHook(0x501D00, CFont::SetBackgroundColor, PATCH_JUMP);
-	InjectHook(0x501D30, CFont::SetBackGroundOnlyTextOn, PATCH_JUMP);
-	InjectHook(0x501D40, CFont::SetBackGroundOnlyTextOff, PATCH_JUMP);
-	InjectHook(0x501D50, CFont::SetRightJustifyOn, PATCH_JUMP);
-	InjectHook(0x501D70, CFont::SetRightJustifyOff, PATCH_JUMP);
-	InjectHook(0x501D90, CFont::SetPropOff, PATCH_JUMP);
-	InjectHook(0x501DA0, CFont::SetPropOn, PATCH_JUMP);
-	InjectHook(0x501DB0, CFont::SetFontStyle, PATCH_JUMP);
-	InjectHook(0x501DC0, CFont::SetRightJustifyWrap, PATCH_JUMP);
-	InjectHook(0x501DD0, CFont::SetAlphaFade, PATCH_JUMP);
-	InjectHook(0x501DE0, CFont::SetDropColor, PATCH_JUMP);
-	InjectHook(0x501E70, CFont::SetDropShadowPosition, PATCH_JUMP);
-
-ENDPATCHES
+#include "common.h"

+#include "patcher.h"

+#include "Sprite2d.h"

+#include "TxdStore.h"

+#include "Font.h"

+

+CFontDetails &CFont::Details = *(CFontDetails*)0x8F317C;

+int16 &CFont::NewLine = *(int16*)0x95CC94;

+CSprite2d *CFont::Sprite = (CSprite2d*)0x95CC04;

+

+#ifdef MORE_LANGUAGES

+uint8 CFont::LanguageSet = FONT_LANGSET_EFIGS;

+int32 CFont::Slot = -1;

+

+int16 CFont::Size[2][3][193] = {

+	{

+#else

+int16 CFont::Size[3][193] = {

+#endif

+		{

+		13, 12, 31, 35, 23, 35, 31,  9, 14, 15, 25, 30, 11, 17, 13, 31,

+		23, 16, 22, 21, 24, 23, 23, 20, 23, 22, 10, 35, 26, 26, 26, 26,

+		30, 26, 24, 23, 24, 22, 21, 24, 26, 10, 20, 26, 22, 29, 26, 25,

+		23, 25, 24, 24, 22, 25, 24, 29, 29, 23, 25, 37, 22, 37, 35, 37,

+		35, 21, 22, 21, 21, 22, 13, 22, 21, 10, 16, 22, 11, 32, 21, 21,

+		23, 22, 16, 20, 14, 21, 20, 30, 25, 21, 21, 33, 33, 33, 33, 35,

+		27, 27, 27, 27, 32, 24, 23, 23, 23, 23, 11, 11, 11, 11, 26, 26,

+		26, 26, 26, 26, 26, 25, 26, 21, 21, 21, 21, 32, 23, 22, 22, 22,

+		22, 11, 11, 11, 11, 22, 22, 22, 22, 22, 22, 22, 22, 26, 21, 24,

+		12, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,

+		26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 18, 26, 26,

+		26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,

+		20

+		},

+

+		{

+		13,  9, 21, 35, 23, 35, 35, 11, 35, 35, 25, 35, 11, 17, 13, 33,

+		28, 14, 22, 21, 24, 23, 23, 21, 23, 22, 10, 35, 13, 35, 13, 33,

+		 5, 25, 22, 23, 24, 21, 21, 24, 24,  9, 20, 24, 21, 27, 25, 25,

+		22, 25, 23, 20, 23, 23, 23, 31, 23, 23, 23, 37, 33, 37, 35, 37,

+		35, 21, 19, 19, 21, 19, 17, 21, 21,  8, 17, 18, 14, 24, 21, 21,

+		20, 22, 19, 20, 20, 19, 20, 26, 21, 20, 21, 33, 33, 33, 33, 35,

+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+		16

+		},

+

+		{

+		15, 14, 16, 25, 19, 26, 22, 11, 18, 18, 27, 26, 13, 19,  9, 27,

+		19, 18, 19, 19, 22, 19, 20, 18, 19, 20, 12, 32, 15, 32, 15, 35,

+		15, 19, 19, 19, 19, 19, 16, 19, 20,  9, 19, 20, 14, 29, 19, 20,

+		19, 19, 19, 19, 21, 19, 20, 32, 20, 19, 19, 33, 31, 39, 37, 39,

+		37, 21, 21, 21, 23, 21, 19, 23, 23, 10, 19, 20, 16, 26, 23, 23,

+		20, 20, 20, 22, 21, 22, 22, 26, 22, 22, 23, 35, 35, 35, 35, 37,

+		19, 19, 19, 19, 29, 19, 19, 19, 19, 19,  9,  9,  9,  9, 19, 19,

+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 30, 19, 19, 19, 19,

+		19, 10, 10, 10, 10, 19, 19, 19, 19, 19, 19, 19, 19, 19, 23, 35,

+		12, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 11, 19, 19,

+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+		19

+		}

+#ifdef MORE_LANGUAGES

+	},

+	{

+		{ 13, 12, 31, 35, 23, 35, 31, 9, 14, 15, 25, 30, 11, 17,

+			13, 31, 23, 16, 22, 21, 24, 23, 23, 20, 23, 22, 10,

+			35, 26, 26, 26, 26, 30, 26, 24, 23, 24, 22, 21, 24,

+			26, 10, 20, 26, 22, 29, 26, 25, 23, 25, 24, 24, 22,

+			25, 24, 29, 29, 23, 25, 37, 22, 37, 35, 37, 35, 21,

+			22, 21, 21, 22, 13, 22, 21, 10, 16, 22, 11, 32, 21,

+			21, 23, 22, 16, 20, 14, 21, 20, 30, 25, 21, 21, 13,

+			33, 13, 13, 13, 24, 22, 22, 19, 26, 21, 30, 20, 23,

+			23, 21, 24, 26, 23, 22, 23, 21, 22, 20, 20, 26, 25,

+			24, 22, 31, 32, 23, 30, 22, 22, 32, 23, 19, 18, 18,

+			15, 22, 19, 27, 19, 20, 20, 18, 22, 24, 20, 19, 19,

+			20, 19, 16, 19, 28, 20, 20, 18, 26, 27, 19, 26, 18,

+			19, 27, 19, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,

+			26, 26, 26, 18, 26, 26, 26, 26, 26, 26, 26, 26, 26,

+			26, 26, 26, 26, 26, 26, 26, 26, 26, 20 },

+		{ 13, 9, 21, 35, 23, 35, 35, 11, 35, 35, 25, 35, 11,

+			17, 13, 33, 28, 14, 22, 21, 24, 23, 23, 21, 23, 22,

+			10, 35, 13, 35, 13, 33, 5, 25, 22, 23, 24, 21, 21, 24,

+			24, 9, 20, 24, 21, 27, 25, 25, 22, 25, 23, 20, 23, 23,

+			23, 31, 23, 23, 23, 37, 33, 37, 35, 37, 35, 21, 19,

+			19, 21, 19, 17, 21, 21, 8, 17, 18, 14, 24, 21, 21, 20,

+			22, 19, 20, 20, 19, 20, 26, 21, 20, 21, 33, 33, 33,

+			33, 35, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+			19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+			19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+			19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+			19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+			19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+			19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+			19, 19, 19, 19, 19, 19, 19, 16, },

+		{ 15, 14, 16, 25, 19,

+			26, 22, 11, 18, 18, 27, 26, 13, 19, 9, 27, 19, 18, 19,

+			19, 22, 19, 20, 18, 19, 20, 12, 32, 15, 32, 15, 35,

+			15, 19, 19, 19, 19, 19, 16, 19, 20, 9, 19, 20, 14, 29,

+			19, 20, 19, 19, 19, 19, 21, 19, 20, 32, 20, 19, 19,

+			33, 31, 39, 37, 39, 37, 21, 21, 21, 23, 21, 19, 23, 23, 10, 19, 20, 16, 26, 23,

+			21, 21, 20, 20, 22, 21, 22, 22, 26, 22, 22, 23, 35,

+			35, 35, 35, 37, 19, 19, 19, 19, 19, 19, 29, 19, 19,

+			19, 20, 22, 31, 19, 19, 19, 19, 19, 29, 19, 29, 19,

+			21, 19, 30, 31, 21, 29, 19, 19, 29, 19, 21, 23, 32,

+			21, 21, 30, 31, 22, 21, 32, 33, 23, 32, 21, 21, 32,

+			21, 19, 19, 30, 31, 22, 22, 21, 32, 33, 23, 32, 21,

+			21, 32, 21, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+			19, 19, 19, 11, 19, 19, 19, 19, 19, 19, 19, 19, 19,

+			19, 19, 19, 19, 19, 19, 19, 19, 19, 19 },

+	}

+#endif

+};

+

+uint16 foreign_table[128] = {

+	  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,

+	  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,

+	  0, 176,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,

+	  0,   0,   0,   0, 177,   0,   0,   0,   0,   0,  95,   0,   0,   0,   0, 175,

+	128, 129, 130,   0, 131,   0, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,

+	  0, 173, 142, 143, 144,   0, 145,   0,   0, 146, 147, 148, 149,   0,   0, 150,

+	151, 152, 153,   0, 154,   0, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,

+	  0, 174, 165, 166, 167,   0, 168,   0,   0, 169, 170, 171, 172,   0,   0,   0,

+};

+

+void

+CFont::Initialise(void)

+{

+	int slot;

+

+	slot = CTxdStore::AddTxdSlot("fonts");

+#ifdef MORE_LANGUAGES

+	Slot = slot;

+	switch (LanguageSet)

+	{

+	case FONT_LANGSET_EFIGS:

+	default:

+		CTxdStore::LoadTxd(slot, "MODELS/FONTS.TXD");

+		break;

+	case FONT_LANGSET_RUSSIAN:

+		CTxdStore::LoadTxd(slot, "MODELS/FONTS_R.TXD");

+		break;

+	}

+#else

+	CTxdStore::LoadTxd(slot, "MODELS/FONTS.TXD");

+#endif

+	CTxdStore::AddRef(slot);

+	CTxdStore::PushCurrentTxd();

+	CTxdStore::SetCurrentTxd(slot);

+	Sprite[0].SetTexture("font2", "font2_mask");

+	Sprite[1].SetTexture("pager", "pager_mask");

+	Sprite[2].SetTexture("font1", "font1_mask");

+	SetScale(1.0f, 1.0f);

+	SetSlantRefPoint(SCREEN_WIDTH, 0.0f);

+	SetSlant(0.0f);

+	SetColor(CRGBA(0xFF, 0xFF, 0xFF, 0));

+	SetJustifyOff();

+	SetCentreOff();

+	SetWrapx(640.0f);

+	SetCentreSize(640.0f);

+	SetBackgroundOff();

+	SetBackgroundColor(CRGBA(0x80, 0x80, 0x80, 0x80));

+	SetBackGroundOnlyTextOff();

+	SetPropOn();

+	SetFontStyle(FONT_BANK);

+	SetRightJustifyWrap(0.0f);

+	SetAlphaFade(255.0f);

+	SetDropShadowPosition(0);

+	CTxdStore::PopCurrentTxd();

+}

+

+#ifdef MORE_LANGUAGES

+void

+CFont::ReloadFonts(uint8 set)

+{

+	if (Slot != -1 && LanguageSet != set) {

+		Sprite[0].Delete();

+		Sprite[1].Delete();

+		Sprite[2].Delete();

+		CTxdStore::PushCurrentTxd();

+		CTxdStore::RemoveTxd(Slot);

+		switch (set)

+		{

+		case FONT_LANGSET_EFIGS:

+		default:

+			CTxdStore::LoadTxd(Slot, "MODELS/FONTS.TXD");

+			break;

+		case FONT_LANGSET_RUSSIAN:

+			CTxdStore::LoadTxd(Slot, "MODELS/FONTS_R.TXD");

+			break;

+		}

+		CTxdStore::SetCurrentTxd(Slot);

+		Sprite[0].SetTexture("font2", "font2_mask");

+		Sprite[1].SetTexture("pager", "pager_mask");

+		Sprite[2].SetTexture("font1", "font1_mask");

+		CTxdStore::PopCurrentTxd();

+	}

+	LanguageSet = set;

+}

+#endif

+

+void

+CFont::Shutdown(void)

+{

+	Sprite[0].Delete();

+	Sprite[1].Delete();

+	Sprite[2].Delete();

+#ifdef MORE_LANGUAGES

+	CTxdStore::RemoveTxdSlot(Slot);

+	Slot = -1;

+#else

+	CTxdStore::RemoveTxdSlot(CTxdStore::FindTxdSlot("fonts"));

+#endif

+}

+

+void

+CFont::InitPerFrame(void)

+{

+	Details.bank = CSprite2d::GetBank(30, Sprite[0].m_pTexture);

+	CSprite2d::GetBank(15, Sprite[1].m_pTexture);

+	CSprite2d::GetBank(15, Sprite[2].m_pTexture);

+	SetDropShadowPosition(0);

+	NewLine = 0;

+}

+

+void

+CFont::PrintChar(float x, float y, uint16 c)

+{

+	if(x <= 0.0f || x > SCREEN_WIDTH ||

+	   y <= 0.0f || y > SCREEN_HEIGHT)	// BUG: game uses SCREENW again

+		return;

+

+	float w = GetCharacterWidth(c) / 32.0f;

+	float xoff = c & 0xF;

+	float yoff = c >> 4;

+

+	if(Details.style == FONT_BANK || Details.style == FONT_HEADING){

+		if(Details.dropShadowPosition != 0){

+			CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank

+				CRect(x + SCREEN_SCALE_X(Details.dropShadowPosition),

+				      y + SCREEN_SCALE_Y(Details.dropShadowPosition),

+				      x + SCREEN_SCALE_X(Details.dropShadowPosition) + 32.0f * Details.scaleX * 1.0f,

+				      y + SCREEN_SCALE_Y(Details.dropShadowPosition) + 40.0f * Details.scaleY * 0.5f),

+				Details.dropColor,

+				xoff/16.0f,                 yoff/12.8f,

+				(xoff+1.0f)/16.0f - 0.001f, yoff/12.8f,

+				xoff/16.0f,                 (yoff+1.0f)/12.8f,

+				(xoff+1.0f)/16.0f - 0.001f, (yoff+1.0f)/12.8f - 0.0001f);

+		}

+		CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank

+			CRect(x, y,

+			      x + 32.0f * Details.scaleX * 1.0f,

+			      y + 40.0f * Details.scaleY * 0.5f),

+			Details.color,

+			xoff/16.0f,                 yoff/12.8f,

+			(xoff+1.0f)/16.0f - 0.001f, yoff/12.8f,

+			xoff/16.0f,                 (yoff+1.0f)/12.8f - 0.002f,

+			(xoff+1.0f)/16.0f - 0.001f, (yoff+1.0f)/12.8f - 0.002f);

+	}else{

+		CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank

+			CRect(x, y,

+			      x + 32.0f * Details.scaleX * w,

+			      y + 32.0f * Details.scaleY * 0.5f),

+			Details.color,

+			xoff/16.0f,               yoff/16.0f,

+			(xoff+w)/16.0f,           yoff/16.0f,

+			xoff/16.0f,               (yoff+1.0f)/16.0f,

+			(xoff+w)/16.0f - 0.0001f, (yoff+1.0f)/16.0f - 0.0001f);

+	}

+}

+

+void

+CFont::PrintString(float xstart, float ystart, uint16 *s)

+{

+	CRect rect;

+	int numSpaces;

+	float lineLength;

+	float x, y;

+	bool first;

+	uint16 *start, *t;

+

+	if(*s == '*')

+		return;

+

+	if(Details.background){

+		GetNumberLines(xstart, ystart, s);	// BUG: result not used

+		GetTextRect(&rect, xstart, ystart, s);

+		CSprite2d::DrawRect(rect, Details.backgroundColor);

+	}

+

+	lineLength = 0.0f;

+	numSpaces = 0;

+	first = true;

+	if(Details.centre || Details.rightJustify)

+		x = 0.0f;

+	else

+		x = xstart;

+	y = ystart;

+	start = s;

+

+	// This is super ugly, I blame R*

+	for(;;){

+		for(;;){

+			for(;;){

+				if(*s == '\0')

+					return;

+				int xend = Details.centre ? Details.centreSize :

+				           Details.rightJustify ? xstart - Details.rightJustifyWrap :

+				           Details.wrapX;

+				if(x + GetStringWidth(s) > xend && !first){

+					// flush line

+					float spaceWidth = !Details.justify || Details.centre ? 0.0f :

+						(Details.wrapX - lineLength) / numSpaces;

+					float xleft = Details.centre ? xstart - x/2 :

+					              Details.rightJustify ? xstart - x :

+					              xstart;

+					PrintString(xleft, y, start, s, spaceWidth);

+					// reset things

+					lineLength = 0.0f;

+					numSpaces = 0;

+					first = true;

+					if(Details.centre || Details.rightJustify)

+						x = 0.0f;

+					else

+						x = xstart;

+					y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY;

+					start = s;

+				}else

+					break;

+			}

+			// advance by one word

+			t = GetNextSpace(s);

+			if(t[0] == '\0' ||

+			   t[0] == ' ' && t[1] == '\0')

+				break;

+			if(!first)

+				numSpaces++;

+			first = false;

+			x += GetStringWidth(s) + GetCharacterSize(*t - ' ');

+			lineLength = x;

+			s = t+1;

+		}

+		// print rest

+		if(t[0] == ' ' && t[1] == '\0')

+			t[0] = '\0';

+		x += GetStringWidth(s);

+		s = t;

+		float xleft = Details.centre ? xstart - x/2 :

+		              Details.rightJustify ? xstart - x :

+		              xstart;

+		PrintString(xleft, y, start, s, 0.0f);

+	}

+}

+

+int

+CFont::GetNumberLines(float xstart, float ystart, uint16 *s)

+{

+	int n;

+	float x, y;

+	uint16 *t;

+

+	n = 0;

+	if(Details.centre || Details.rightJustify)

+		x = 0.0f;

+	else

+		x = xstart;

+	y = ystart;

+

+	while(*s){

+		if(x + GetStringWidth(s) > (Details.centre ? Details.centreSize : Details.wrapX)){

+			// reached end of line

+			if(Details.centre || Details.rightJustify)

+				x = 0.0f;

+			else

+				x = xstart;

+			n++;

+			// Why even?

+			y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY;

+		}else{

+			// still space in current line

+			t = GetNextSpace(s);

+			if(*t == '\0'){

+				// end of string

+				x += GetStringWidth(s);

+				n++;

+				s = t;

+			}else{

+				x += GetStringWidth(s);

+				x += GetCharacterSize(*t - ' ');

+				s = t+1;

+			}

+		}

+	}

+

+	return n;

+}

+

+void

+CFont::GetTextRect(CRect *rect, float xstart, float ystart, uint16 *s)

+{

+	int numLines;

+	float x, y;

+	int16 maxlength;

+	uint16 *t;

+

+	maxlength = 0;

+	numLines = 0;

+	if(Details.centre || Details.rightJustify)

+		x = 0.0f;

+	else

+		x = xstart;

+	y = ystart;

+

+	while(*s){

+		if(x + GetStringWidth(s) > (Details.centre ? Details.centreSize : Details.wrapX)){

+			// reached end of line

+			if(x > maxlength)

+				maxlength = x;

+			if(Details.centre || Details.rightJustify)

+				x = 0.0f;

+			else

+				x = xstart;

+			numLines++;

+			y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY;

+		}else{

+			// still space in current line

+			t = GetNextSpace(s);

+			if(*t == '\0'){

+				// end of string

+				x += GetStringWidth(s);

+				if(x > maxlength)

+					maxlength = x;

+				numLines++;

+				s = t;

+			}else{

+				x += GetStringWidth(s);

+				x += GetCharacterSize(*t - ' ');

+				s = t+1;

+			}

+		}

+	}

+

+	if(Details.centre){

+		if(Details.backgroundOnlyText){

+			rect->left = xstart - maxlength/2 - 4.0f;

+			rect->right = xstart + maxlength/2 + 4.0f;

+			rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines +

+				ystart + 2.0f;

+			rect->top = ystart - 2.0f;

+		}else{

+			rect->left = xstart - Details.centreSize*0.5f - 4.0f;

+			rect->right = xstart + Details.centreSize*0.5f + 4.0f;

+			rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines +

+				ystart + 2.0f;

+			rect->top = ystart - 2.0f;

+		}

+	}else{

+		rect->left = xstart - 4.0f;

+		rect->right = Details.wrapX;

+		// WTF?

+		rect->bottom = ystart - 4.0f + 4.0f;

+		rect->top = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines +

+				ystart + 2.0f + 2.0f;

+	}

+}

+

+void

+CFont::PrintString(float x, float y, uint16 *start, uint16 *end, float spwidth)

+{

+	uint16 *s, c, unused;

+

+	for(s = start; s < end; s++){

+		if(*s == '~')

+			s = ParseToken(s, &unused);

+		c = *s - ' ';

+		if(Details.slant != 0.0f)

+			y = (Details.slantRefX - x)*Details.slant + Details.slantRefY;

+		PrintChar(x, y, c);

+		x += GetCharacterSize(c);

+		if(c == 0)	// space

+			x += spwidth;

+	}

+}

+

+float

+CFont::GetCharacterWidth(uint16 c)

+{

+#ifdef MORE_LANGUAGES

+	if (Details.proportional)

+		return Size[LanguageSet][Details.style][c];

+	else

+		return Size[LanguageSet][Details.style][192];

+#else

+	if (Details.proportional)

+		return Size[Details.style][c];

+	else

+		return Size[Details.style][192];

+#endif // MORE_LANGUAGES

+}

+

+float

+CFont::GetCharacterSize(uint16 c)

+{

+#ifdef MORE_LANGUAGES

+	if(Details.proportional)

+		return Size[LanguageSet][Details.style][c] * Details.scaleX;

+	else

+		return Size[LanguageSet][Details.style][192] * Details.scaleX;

+#else

+	if (Details.proportional)

+		return Size[Details.style][c] * Details.scaleX;

+	else

+		return Size[Details.style][192] * Details.scaleX;

+#endif // MORE_LANGUAGES

+}

+

+float

+CFont::GetStringWidth(uint16 *s, bool spaces)

+{

+	float w;

+

+	w = 0.0f;

+	for(; (*s != ' ' || spaces) && *s != '\0'; s++){

+		if(*s == '~'){

+			s++;

+			while(*s != '~') s++;

+			s++;

+			if(*s == ' ' && !spaces)

+				break;

+		}

+		w += GetCharacterSize(*s - ' ');

+	}

+	return w;

+}

+

+uint16*

+CFont::GetNextSpace(uint16 *s)

+{

+	for(; *s != ' ' && *s != '\0'; s++)

+		if(*s == '~'){

+			s++;

+			while(*s != '~') s++;

+			s++;

+			if(*s == ' ')

+				break;

+		}

+	return s;

+}

+

+uint16*

+CFont::ParseToken(uint16 *s, uint16*)

+{

+	s++;

+	if(Details.color.r || Details.color.g || Details.color.b)

+		switch(*s){

+		case 'N':

+		case 'n':

+			NewLine = 1;

+			break;

+		case 'b': SetColor(CRGBA(0x80, 0xA7, 0xF3, 0xFF)); break;

+		case 'g': SetColor(CRGBA(0x5F, 0xA0, 0x6A, 0xFF)); break;

+		case 'h': SetColor(CRGBA(0xE1, 0xE1, 0xE1, 0xFF)); break;

+		case 'l': SetColor(CRGBA(0x00, 0x00, 0x00, 0xFF)); break;

+		case 'p': SetColor(CRGBA(0xA8, 0x6E, 0xFC, 0xFF)); break;

+		case 'r': SetColor(CRGBA(0x71, 0x2B, 0x49, 0xFF)); break;

+		case 'w': SetColor(CRGBA(0xAF, 0xAF, 0xAF, 0xFF)); break;

+		case 'y': SetColor(CRGBA(0xD2, 0xC4, 0x6A, 0xFF)); break;

+		}

+	while(*s != '~') s++;

+	return s+1;

+}

+

+void

+CFont::DrawFonts(void)

+{

+	CSprite2d::DrawBank(Details.bank);

+	CSprite2d::DrawBank(Details.bank+1);

+	CSprite2d::DrawBank(Details.bank+2);

+}

+

+uint16

+CFont::character_code(uint8 c)

+{

+	if(c < 128)

+		return c;

+	return foreign_table[c-128];

+}

+

+STARTPATCHES

+

+	InjectHook(0x500A40, CFont::Initialise, PATCH_JUMP);

+	InjectHook(0x500BA0, CFont::Shutdown, PATCH_JUMP);

+	InjectHook(0x500BE0, CFont::InitPerFrame, PATCH_JUMP);

+	InjectHook(0x500C30, CFont::PrintChar, PATCH_JUMP);

+	InjectHook(0x500F50, (void (*)(float, float, uint16*))CFont::PrintString, PATCH_JUMP);

+	InjectHook(0x501260, CFont::GetNumberLines, PATCH_JUMP);

+	InjectHook(0x5013B0, CFont::GetTextRect, PATCH_JUMP);

+	InjectHook(0x501730, (void (*)(float, float, uint16*, uint16*, float))CFont::PrintString, PATCH_JUMP);

+	InjectHook(0x5017E0, CFont::GetCharacterWidth, PATCH_JUMP);

+	InjectHook(0x501840, CFont::GetCharacterSize, PATCH_JUMP);

+	InjectHook(0x5018A0, CFont::GetStringWidth, PATCH_JUMP);

+	InjectHook(0x501960, CFont::GetNextSpace, PATCH_JUMP);

+	InjectHook(0x5019A0, CFont::ParseToken, PATCH_JUMP);

+	InjectHook(0x501B50, CFont::DrawFonts, PATCH_JUMP);

+	InjectHook(0x501E80, CFont::character_code, PATCH_JUMP);

+

+	InjectHook(0x501B80, CFont::SetScale, PATCH_JUMP);

+	InjectHook(0x501BA0, CFont::SetSlantRefPoint, PATCH_JUMP);

+	InjectHook(0x501BC0, CFont::SetSlant, PATCH_JUMP);

+	InjectHook(0x501BD0, CFont::SetColor, PATCH_JUMP);

+	InjectHook(0x501C60, CFont::SetJustifyOn, PATCH_JUMP);

+	InjectHook(0x501C80, CFont::SetJustifyOff, PATCH_JUMP);

+	InjectHook(0x501C90, CFont::SetCentreOn, PATCH_JUMP);

+	InjectHook(0x501CB0, CFont::SetCentreOff, PATCH_JUMP);

+	InjectHook(0x501CC0, CFont::SetWrapx, PATCH_JUMP);

+	InjectHook(0x501CD0, CFont::SetCentreSize, PATCH_JUMP);

+	InjectHook(0x501CE0, CFont::SetBackgroundOn, PATCH_JUMP);

+	InjectHook(0x501CF0, CFont::SetBackgroundOff, PATCH_JUMP);

+	InjectHook(0x501D00, CFont::SetBackgroundColor, PATCH_JUMP);

+	InjectHook(0x501D30, CFont::SetBackGroundOnlyTextOn, PATCH_JUMP);

+	InjectHook(0x501D40, CFont::SetBackGroundOnlyTextOff, PATCH_JUMP);

+	InjectHook(0x501D50, CFont::SetRightJustifyOn, PATCH_JUMP);

+	InjectHook(0x501D70, CFont::SetRightJustifyOff, PATCH_JUMP);

+	InjectHook(0x501D90, CFont::SetPropOff, PATCH_JUMP);

+	InjectHook(0x501DA0, CFont::SetPropOn, PATCH_JUMP);

+	InjectHook(0x501DB0, CFont::SetFontStyle, PATCH_JUMP);

+	InjectHook(0x501DC0, CFont::SetRightJustifyWrap, PATCH_JUMP);

+	InjectHook(0x501DD0, CFont::SetAlphaFade, PATCH_JUMP);

+	InjectHook(0x501DE0, CFont::SetDropColor, PATCH_JUMP);

+	InjectHook(0x501E70, CFont::SetDropShadowPosition, PATCH_JUMP);

+

+ENDPATCHES

diff --git a/src/render/Font.h b/src/render/Font.h
index 132ad168..26309377 100644
--- a/src/render/Font.h
+++ b/src/render/Font.h
@@ -39,9 +39,23 @@ enum {
 	ALIGN_RIGHT,
 };
 
+#ifdef MORE_LANGUAGES
+enum
+{
+	FONT_LANGSET_EFIGS,
+	FONT_LANGSET_RUSSIAN
+};
+#endif
+
 class CFont
 {
+#ifdef MORE_LANGUAGES
+	static int16 Size[2][3][193];
+	static uint8 LanguageSet;
+	static int32 Slot;
+#else
 	static int16 Size[3][193];
+#endif
 	static int16 &NewLine;
 	static CSprite2d *Sprite;	//[3]
 public:
@@ -136,4 +150,6 @@ public:
 		if(Details.alphaFade < 255.0f)
 			Details.dropColor.a *= Details.alphaFade/255.0f;
 	}
+
+	static void ReloadFonts(uint8 set);
 };
diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index 8bffa7e1..d0cdb310 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -43,6 +43,11 @@ CText::Load(void)
 	case LANGUAGE_SPANISH:

 		sprintf(filename, "SPANISH.GXT");

 		break;

+#ifdef MORE_LANGUAGES

+	case LANGUAGE_RUSSIAN:

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

+		break;

+#endif

 	}

 

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