Fix build: Add a temporary compiler flag to set if liblcf contains th…

…e custom "language" field
florianessl · Feb 3, 2025 · 56de05b · 56de05b
1 parent 14f28d2
commit 56de05b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/player.cpp b/src/player.cpp
@@ -1175,11 +1175,13 @@ void Player::LoadSavegame(const std::string& save_name, int save_id) {
 			verstr.str(), Version::STRING);
 	}
 
+#ifdef LIBLCF_HAS_LANG_FIELD
 	std::string savegame_language = ToString(save->easyrpg_data.language);
 	if (!savegame_language.empty() && savegame_language != "default") {
 		Output::Debug("Savegame language: '{}' ", savegame_language);
 		Player::translation.SelectLanguage(savegame_language);
 	}
+#endif
 
 	// Compatibility hacks for old EasyRPG Player saves.
 	if (save->easyrpg_data.version == 0) {

diff --git a/src/scene_save.cpp b/src/scene_save.cpp
@@ -134,12 +134,15 @@ bool Scene_Save::Save(std::ostream& os, int slot_id, bool prepare_save) {
 		Main_Data::game_system->IncSaveCount();
 	}
 
+#ifdef LIBLCF_HAS_LANG_FIELD
 	if (!Tr::HasActiveTranslation()) {
 		save.easyrpg_data.language = lcf::DBString(lcf::rpg::SaveEasyRpgData::kDefaultLanguage);
 	}
 	else {
 		save.easyrpg_data.language = lcf::DBString(Player::translation.GetCurrentLanguage().lang_dir);
 	}
+#endif
+
 	save.targets = Main_Data::game_targets->GetSaveData();
 	save.system = Main_Data::game_system->GetSaveData();
 	save.system.switches = Main_Data::game_switches->GetData();

diff --git a/src/translation.cpp b/src/translation.cpp
@@ -161,10 +161,11 @@ const std::vector<Language>& Translation::GetLanguages() const
 std::string Translation::GetLatestSavegameLanguage() {
 	// TODO: Disable for platforms with slow I/O
 
+#ifdef LIBLCF_HAS_LANG_FIELD
+	std::string latest_lang = std::string(lcf::rpg::SaveEasyRpgData::kDefaultLanguage);
 	// Refresh File Finder Save Folder
 	FilesystemView fs = FileFinder::Save();
 	double latest_time = 0;
-	std::string latest_lang = std::string(lcf::rpg::SaveEasyRpgData::kDefaultLanguage);
 
 	for (int i = 0; i < Utils::Clamp<int32_t>(lcf::Data::system.easyrpg_max_savefiles, 3, 99); i++) {
 		std::stringstream ss;
@@ -190,6 +191,9 @@ std::string Translation::GetLatestSavegameLanguage() {
 	}
 
 	return latest_lang;
+#else
+	return "default";
+#endif
 }