natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings the clientData after loading the project

Browse Source
This commit is contained in:
Alister
2021-12-23 16:14:03 +00:00
parent bc6f62d047
commit f28a7c3824
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/noggit/application/NoggitApplication.cpp
View File

@@ -110,28 +110,10 @@ namespace Noggit::Application
//All of the below should be Project Initalisation
srand(::time(nullptr));
QSettings settings;
QDir path(settings.value("project/game_path").toString());
wowpath = path.absolutePath().toStdString();
Log << "Game path: " << wowpath << std::endl;
project_path = settings.value("project/path", path.absolutePath()).toString().toStdString();
settings.setValue("project/path", QString::fromStdString(project_path));
Log << "Project path: " << project_path << std::endl;
settings.setValue("project/game_path", path.absolutePath());
settings.setValue("project/path", QString::fromStdString(project_path));
}
void NoggitApplication::Start()
{
_client_data = std::make_unique<BlizzardArchive::ClientData>(wowpath.string(), BlizzardArchive::ClientVersion::WOTLK, BlizzardArchive::Locale::AUTO, project_path);
OpenDBs();
projectSelectionPage = std::make_unique<Noggit::Ui::Windows::noggitRedProjectPage>(this);
projectSelectionPage->show();
}

5
src/noggit/application/NoggitApplication.hpp
View File

@@ -46,6 +46,7 @@ namespace Noggit::Application {
}
BlizzardArchive::ClientData* clientData() { return _client_data.get(); };
void clientData(std::shared_ptr<BlizzardArchive::ClientData> data) { _client_data = data; };
void Start();
void Initalize(int argc, char* argv[]);
@@ -56,10 +57,8 @@ namespace Noggit::Application {
std::shared_ptr<Noggit::Application::NoggitApplicationConfiguration> _applicationConfiguration;
std::unique_ptr<Noggit::Ui::Windows::noggitRedProjectPage> projectSelectionPage;
std::unique_ptr<BlizzardArchive::ClientData> _client_data;
std::shared_ptr<BlizzardArchive::ClientData> _client_data;
std::filesystem::path wowpath;
std::string project_path;
};
}

15
src/noggit/project/ApplicationProject.h
View File

@@ -47,8 +47,10 @@ namespace Noggit::Project
{
public:
std::string ProjectName;
std::string ClientPath;
ProjectVersion ProjectVersion;
std::shared_ptr<BlizzardDatabaseLib::BlizzardDatabase> ClientDatabase;
std::shared_ptr<BlizzardArchive::ClientData> ClientData;
};
class ApplicationProject
@@ -198,22 +200,34 @@ namespace Noggit::Project
if (projectConfiguration.contains("Client") && projectConfiguration["Client"].isObject())
{
auto projectClientConfiguration = projectConfiguration["Client"].toObject();
if (projectClientConfiguration.contains("ClientPath"))
{
project.ClientPath = projectClientConfiguration["ClientPath"].toString().toStdString();
}
if (projectClientConfiguration.contains("ClientVersion"))
{
auto clientVersion = projectClientConfiguration["ClientVersion"].toString().toStdString();
auto clientVersionEnum = Noggit::Project::ProjectVersion::WOTLK;
auto clientBuild = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");
auto clientArchiveVersion = BlizzardArchive::ClientVersion::WOTLK;
auto clientArchiveLocale = BlizzardArchive::Locale::AUTO;
if (clientVersion == std::string("Shadowlands"))
{
clientVersionEnum = Noggit::Project::ProjectVersion::SL;
clientArchiveVersion = BlizzardArchive::ClientVersion::SL;
clientBuild = BlizzardDatabaseLib::Structures::Build("9.1.0.39584");
clientArchiveLocale = BlizzardArchive::Locale::enUS;
}
if (clientVersion == std::string("Wrath Of The Lich King"))
{
clientVersionEnum = Noggit::Project::ProjectVersion::WOTLK;
clientArchiveVersion = BlizzardArchive::ClientVersion::WOTLK;
clientBuild = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");
clientArchiveLocale = BlizzardArchive::Locale::AUTO;
}
project.ProjectVersion = clientVersionEnum;
@@ -222,6 +236,7 @@ namespace Noggit::Project
std::string dbdFileDirectory = _configuration->ApplicationDatabaseDefinitionsPath;
project.ClientDatabase = std::make_shared<BlizzardDatabaseLib::BlizzardDatabase>(dbcFileDirectory, dbdFileDirectory, clientBuild);
project.ClientData = std::make_shared<BlizzardArchive::ClientData>(project.ClientPath, clientArchiveVersion, clientArchiveLocale, std::string(""));
}
}
}

3
src/noggit/ui/windows/mainWindow/main_window.cpp
View File

@@ -65,8 +65,9 @@ namespace Noggit::Ui
setWindowTitle (QString::fromStdString (title.str()));
setWindowIcon (QIcon (":/icon"));
setCentralWidget (_null_widget);
OpenDBs();
setCentralWidget (_null_widget);
createBookmarkList();
_about = new about(this);

3
src/noggit/ui/windows/projectSelection/noggitredprojectpage.cpp
View File

@@ -60,6 +60,9 @@ namespace Noggit::Ui::Windows
auto projectPath = std::filesystem::path(applicationProjectsFolderPath / projectName);
_selectedProject = applicationProjectService.LoadProject(projectPath, projectName);
//This to not be static, but its hard to remove
Noggit::Application::NoggitApplication::instance()->clientData(_selectedProject->ClientData);
close();
projectSelectionPage = std::make_unique<Noggit::Ui::main_window>(_noggitApplication->GetConfiguration(), _selectedProject);
projectSelectionPage->showMaximized();