Merge pull request #371 from Sergeanur/MoreLanguages

Add russian lang support

src/core/Frontend.cpp

@@ -1727,6 +1727,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;
@@ -1734,6 +1745,11 @@ void CMenuManager::InitialiseChangedLanguageSettings()
 		case LANGUAGE_GERMAN:
 			CGame::germanGame = true;
 			break;
+#ifdef MORE_LANGUAGES
+		case LANGUAGE_RUSSIAN:
+			CGame::russianGame = true;
+			break;
+#endif
 		default:
 			break;
 		}
@@ -2935,6 +2951,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();
 

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

src/core/Game.cpp

@@ -99,6 +99,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
 
 int &gameTxdSlot = *(int*)0x628D88;
 

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

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,
 	},
 

src/core/config.h

@@ -175,6 +175,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

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 

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

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