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

Merge branch 'noggit-shadowlands' of https://gitlab.com/prophecy-rp/noggit-red into noggit-shadowlands

Browse Source
This commit is contained in:
Alister
2021-12-25 17:05:47 +00:00
parent 58f04af14d 8d4ccad024
commit f8e9652450
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/noggit/DBCFile.h
View File

@@ -8,6 +8,7 @@
#include <stdexcept>
#include <cstring>
#include <algorithm>
#include <memory>
#include <blizzard-archive-library/include/ClientData.hpp>
class DBCFile

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

@@ -58,7 +58,7 @@ namespace Noggit::Project
public:
ApplicationProjectReader() = default;
NoggitProject ReadProject(std::filesystem::path projectPath)
std::optional<NoggitProject> ReadProject(std::filesystem::path const& projectPath)
{
for (const auto& entry : std::filesystem::directory_iterator(projectPath))
{
@@ -109,6 +109,8 @@ namespace Noggit::Project
return project;
}
}
return {};
}
};
@@ -123,7 +125,8 @@ namespace Noggit::Project
_configuration = configuration;
}
void CreateProject(std::filesystem::path projectPath, std::filesystem::path clientPath, std::string clientVersion, std::string projectName)
void CreateProject(std::filesystem::path const& projectPath, std::filesystem::path const& clientPath,
std::string const& clientVersion, std::string const& projectName)
{
std::filesystem::create_directory(projectPath);
@@ -239,38 +242,40 @@ namespace Noggit::Project
}
}
std::shared_ptr<NoggitProject> LoadProject(std::filesystem::path projectPath)
std::shared_ptr<NoggitProject> LoadProject(std::filesystem::path const& projectPath)
{
auto projectReader = ApplicationProjectReader();
auto project = projectReader.ReadProject(projectPath);
assert (project.has_value());
std::string dbcFileDirectory = (projectPath / "workspace" / "DBFilesClient").generic_string();
std::string dbdFileDirectory = _configuration->ApplicationDatabaseDefinitionsPath;
auto clientBuild = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");
auto clientArchiveVersion = BlizzardArchive::ClientVersion::WOTLK;
auto clientArchiveLocale = BlizzardArchive::Locale::AUTO;
if (project.ProjectVersion == ProjectVersion::SL)
if (project->ProjectVersion == ProjectVersion::SL)
{
clientArchiveVersion = BlizzardArchive::ClientVersion::SL;
clientBuild = BlizzardDatabaseLib::Structures::Build("9.1.0.39584");
clientArchiveLocale = BlizzardArchive::Locale::enUS;
}
if (project.ProjectVersion == ProjectVersion::WOTLK)
if (project->ProjectVersion == ProjectVersion::WOTLK)
{
clientArchiveVersion = BlizzardArchive::ClientVersion::WOTLK;
clientBuild = BlizzardDatabaseLib::Structures::Build("3.3.5.12340");
clientArchiveLocale = BlizzardArchive::Locale::AUTO;
}
project.ClientDatabase = std::make_shared<BlizzardDatabaseLib::BlizzardDatabase>(
project->ClientDatabase = std::make_shared<BlizzardDatabaseLib::BlizzardDatabase>(
dbcFileDirectory, dbdFileDirectory, clientBuild);
project.ClientData = std::make_shared<BlizzardArchive::ClientData>(
project.ClientPath, clientArchiveVersion, clientArchiveLocale, std::string(""));
project->ClientData = std::make_shared<BlizzardArchive::ClientData>(
project->ClientPath, clientArchiveVersion, clientArchiveLocale, std::string(""));
return std::make_shared<NoggitProject>(project);
return std::make_shared<NoggitProject>(project.value());
}
};
}