Merge pull request #3419 from florianessl/fix/TranslateTextFiles

Translation fix: Files inside "Text" folder were not translated

Author: Ghabry

src/filefinder.cpp

@@ -424,6 +424,14 @@ std::string find_generic(const DirectoryTree::Args& args) {
 }
 
 std::string find_generic_with_fallback(DirectoryTree::Args& args) {
+	// Searches first in the Save directory (because the game could have written
+	// files there, then in the Game directory.
+	// Disable this behaviour when Game and Save are shared as this breaks the
+	// translation redirection.
+	if (Player::shared_game_and_save_directory) {
+		return find_generic(args);
+	}
+
 	std::string found = FileFinder::Save().FindFile(args);
 	if (found.empty()) {
 		return find_generic(args);
@@ -453,11 +461,6 @@ std::string FileFinder::FindFont(std::string_view name) {
 	return find_generic(args);
 }
 
-std::string FileFinder::FindText(std::string_view name) {
-	DirectoryTree::Args args = { MakePath("Text", name), TEXT_TYPES, 1, true };
-	return find_generic_with_fallback(args);
-}
-
 Filesystem_Stream::InputStream open_generic(std::string_view dir, std::string_view name, DirectoryTree::Args& args) {
 	if (!Tr::GetCurrentTranslationId().empty()) {
 		auto tr_fs = Tr::GetCurrentTranslationFilesystem();
@@ -478,6 +481,14 @@ Filesystem_Stream::InputStream open_generic(std::string_view dir, std::string_vi
 }
 
 Filesystem_Stream::InputStream open_generic_with_fallback(std::string_view dir, std::string_view name, DirectoryTree::Args& args) {
+	if (!Tr::GetCurrentTranslationId().empty()) {
+		auto tr_fs = Tr::GetCurrentTranslationFilesystem();
+		auto is = tr_fs.OpenFile(args);
+		if (is) {
+			return is;
+		}
+	}
+
 	auto is = FileFinder::Save().OpenFile(args);
 	if (!is) { is = open_generic(dir, name, args); }
 	if (!is) {

src/filefinder.h

@@ -163,14 +163,6 @@ namespace FileFinder {
 	 */
 	std::string FindFont(std::string_view name);
 
-	/**
-	 * Finds a text file in the current RPG Maker game.
-	 *
-	 * @param name the text path and name.
-	 * @return path to file.
-	 */
-	std::string FindText(std::string_view name);
-
 	/**
 	 * Finds an image file and opens a file handle to it.
 	 * Searches through the current RPG Maker game and the RTP directories.

src/player.cpp

@@ -123,6 +123,7 @@ namespace Player {
 	uint32_t escape_char;
 	std::string game_title;
 	std::string game_title_original;
+	bool shared_game_and_save_directory = false;
 	std::shared_ptr<Meta> meta;
 	FileExtGuesser::RPG2KFileExtRemap fileext_map;
 	std::string startup_language;
@@ -716,7 +717,9 @@ void Player::CreateGameObjects() {
 
 	std::string game_path = FileFinder::GetFullFilesystemPath(FileFinder::Game());
 	std::string save_path = FileFinder::GetFullFilesystemPath(FileFinder::Save());
-	if (game_path == save_path) {
+	shared_game_and_save_directory = (game_path == save_path);
+
+	if (shared_game_and_save_directory) {
 		Output::DebugStr("Game and Save Directory:");
 		FileFinder::DumpFilesystem(FileFinder::Game());
 	} else {

src/player.h

@@ -409,6 +409,9 @@ namespace Player {
 	/** Original game title, in case it was overriden by a translation. */
 	extern std::string game_title_original;
 
+	/** Indicates whether FileFinder::Game() and Save() point to the same directory. */
+	extern bool shared_game_and_save_directory;
+
 	/** Meta class containing additional external data for this game. */
 	extern std::shared_ptr<Meta> meta;