migrate from std::filesystem::path to io::path (WIP)

This commit is contained in:
MihailRis
2025-01-30 22:23:13 +03:00
parent 1e22882284
commit e0314803c0
72 changed files with 1189 additions and 791 deletions
+7 -7
View File
@@ -78,7 +78,7 @@ void World::write(Level* level) {
std::unique_ptr<Level> World::create(
const std::string& name,
const std::string& generator,
const fs::path& directory,
const io::path& directory,
uint64_t seed,
EngineSettings& settings,
const Content& content,
@@ -98,7 +98,7 @@ std::unique_ptr<Level> World::create(
logger.info() << "created nameless world";
} else {
logger.info() << "created world '" << name << "' ("
<< directory.u8string() << ")";
<< directory.string() << ")";
}
logger.info() << "world seed: " << seed << " generator: " << generator;
return std::make_unique<Level>(std::move(world), content, settings);
@@ -116,7 +116,7 @@ std::unique_ptr<Level> World::load(
throw world_load_error("could not to find world.json");
}
logger.info() << "loading world " << info->name << " ("
<< worldFilesPtr->getFolder().u8string() << ")";
<< worldFilesPtr->getFolder().string() << ")";
logger.info() << "world version: " << info->major << "." << info->minor
<< " seed: " << info->seed
<< " generator: " << info->generator;
@@ -129,8 +129,8 @@ std::unique_ptr<Level> World::load(
auto level = std::make_unique<Level>(std::move(world), content, settings);
fs::path file = wfile->getPlayerFile();
if (!fs::is_regular_file(file)) {
io::path file = wfile->getPlayerFile();
if (!io::is_regular_file(file)) {
logger.warning() << "player.json does not exists";
level->players->create();
} else {
@@ -149,8 +149,8 @@ std::unique_ptr<Level> World::load(
std::shared_ptr<ContentReport> World::checkIndices(
const std::shared_ptr<WorldFiles>& worldFiles, const Content* content
) {
fs::path indicesFile = worldFiles->getIndicesFile();
if (fs::is_regular_file(indicesFile)) {
io::path indicesFile = worldFiles->getIndicesFile();
if (io::is_regular_file(indicesFile)) {
return ContentReport::create(worldFiles, indicesFile, content);
}
return nullptr;