redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-27 14:17:45 +00:00
Code Activity

Handle even more changes in libxiv refactors

Browse source
This commit is contained in:
Joshua Goins 2022-04-17 19:08:48 -04:00
parent 53ff0e72e7
commit d454dcf005
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
exdviewer/src/mainwindow.cpp
View file

@ -53,8 +53,7 @@ MainWindow::MainWindow(GameData& data) : data(data) {
path = getEXDFilename(exh, nameLowercase, getLanguageCode(Language::English), page);
}
data.extractFile("exd/" + path, path);
auto exd = readEXD(exh, path, page);
auto exd = readEXD(exh, *data.extractFile("exd/" + path), page);
for (int i = 0; i < exd.rows.size(); i++) {
for (int j = 0; j < exd.rows[i].data.size(); j++) {
auto newItem = new QTableWidgetItem(exd.rows[i].data[j].data.c_str());

2
libxiv

@ -1 +1 @@
Subproject commit b11767dc0243d06b1811a43982c76dbe2716caaf
Subproject commit c78a1ab2458d18ddd92fc2728e3eedd95fdc4078

10
mdlviewer/src/mainwindow.cpp
View file

@ -108,8 +108,7 @@ MainWindow::MainWindow(GameData& data) : data(data) {
auto exh = *data.readExcelSheet("Item");
auto path = getEXDFilename(exh, "item", getLanguageCode(Language::English), exh.pages[1]);
data.extractFile("exd/" + path, path);
auto exd = readEXD(exh, path, exh.pages[1]);
auto exd = readEXD(exh, *data.extractFile("exd/" + path), exh.pages[1]);
for(auto row : exd.rows) {
auto primaryModel = row.data[47].uint64Data;
auto secondaryModel = row.data[48].uint64Data;
@ -227,12 +226,13 @@ void MainWindow::refreshModel() {
#endif
for(auto gear : loadedGears) {
data.extractFile(build_equipment_path(gear->modelInfo.primaryID, currentRace, gear->slot), "top.mdl");
auto mdl_data = data.extractFile(build_equipment_path(gear->modelInfo.primaryID, currentRace, gear->slot));
auto model = parseMDL(*mdl_data);
#ifndef USE_STANDALONE_WINDOW
vkWindow->models.push_back(renderer->addModel(parseMDL("top.mdl"), currentLod));
vkWindow->models.push_back(renderer->addModel(model, currentLod));
#else
standaloneWindow->models.push_back(renderer->addModel(parseMDL("top.mdl"), currentLod));
standaloneWindow->models.push_back(renderer->addModel(model, currentLod));
#endif
}
}