From f244321c5b42d77d476edff9141400297141319f Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Mon, 11 Apr 2022 10:37:36 -0400 Subject: [PATCH] Add support for reading language seperated excel sheets By default they are always read as English, but language support will be added in a later commit. --- libxiv | 2 +- src/mainwindow.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libxiv b/libxiv index 7006cc4..58cd409 160000 --- a/libxiv +++ b/libxiv @@ -1 +1 @@ -Subproject commit 7006cc46625dac73cc64b489174179cbb9e41262 +Subproject commit 58cd40912f15c4c66d157eab4ed708755803c753 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c632d44..f38499e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -40,7 +40,14 @@ MainWindow::MainWindow(GameData& data) : data(data) { for(auto page : exh.pages) { if(page.startId == 0) { fmt::print("page, row count = {}, start id = {}\n", page.rowCount, page.startId); - auto path = getEXDFilename(exh, nameLowercase, page); + + std::string path; + if(exh.language.empty()) { + path = getEXDFilename(exh, nameLowercase, "", page); + } else { + path = getEXDFilename(exh, nameLowercase, getLanguageCode(Language::English), page); + } + data.extractFile("exd/" + path, path); auto exd = readEXD(exh, path, page); for (int i = 0; i < exd.rows.size(); i++) {