From fdf935d85fc02591f4d0574e464d41d5f91770c9 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 23 Sep 2023 15:26:00 -0400 Subject: [PATCH] Use new settings in exdviewer, explorer and mdlviewer --- exdviewer/src/main.cpp | 5 ++++- explorer/src/main.cpp | 5 ++++- mdlviewer/src/main.cpp | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/exdviewer/src/main.cpp b/exdviewer/src/main.cpp index 35fbea0..5ab217b 100644 --- a/exdviewer/src/main.cpp +++ b/exdviewer/src/main.cpp @@ -5,11 +5,14 @@ #include #include "mainwindow.h" +#include "settings.h" int main(int argc, char* argv[]) { QApplication app(argc, argv); - MainWindow w(physis_gamedata_initialize(argv[1])); + const QString gameDir{getGameDirectory()}; + const std::string gameDirStd{gameDir.toStdString()}; + MainWindow w(physis_gamedata_initialize(gameDirStd.c_str())); w.show(); return app.exec(); diff --git a/explorer/src/main.cpp b/explorer/src/main.cpp index 60df934..01923bb 100644 --- a/explorer/src/main.cpp +++ b/explorer/src/main.cpp @@ -7,6 +7,7 @@ #include #include "mainwindow.h" +#include "settings.h" int main(int argc, char* argv[]) { QApplication app(argc, argv); @@ -15,7 +16,9 @@ int main(int argc, char* argv[]) { app.setStyle("Windows"); - MainWindow w(physis_gamedata_initialize(argv[1])); + const QString gameDir{getGameDirectory()}; + const std::string gameDirStd{gameDir.toStdString()}; + MainWindow w(physis_gamedata_initialize(gameDirStd.c_str())); w.show(); return app.exec(); diff --git a/mdlviewer/src/main.cpp b/mdlviewer/src/main.cpp index 35fbea0..5ab217b 100644 --- a/mdlviewer/src/main.cpp +++ b/mdlviewer/src/main.cpp @@ -5,11 +5,14 @@ #include #include "mainwindow.h" +#include "settings.h" int main(int argc, char* argv[]) { QApplication app(argc, argv); - MainWindow w(physis_gamedata_initialize(argv[1])); + const QString gameDir{getGameDirectory()}; + const std::string gameDirStd{gameDir.toStdString()}; + MainWindow w(physis_gamedata_initialize(gameDirStd.c_str())); w.show(); return app.exec();