Merge branch 'main' into main

This commit is contained in:
Onran 2024-02-22 21:20:30 +09:00 • committed by GitHub
commit a78b5213e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 256 additions and 43 deletions

View file

@ -91,7 +91,9 @@ Level* World::create(std::string name,
const std::vector<ContentPack>& packs) {
auto world = new World(name, type, directory, seed, settings, content, packs);
auto level = new Level(world, content, settings);
auto inventory = level->player->getInventory();
inventory->setId(world->getNextInventoryId());
level->inventories->store(inventory);
return level;
}
@ -110,6 +112,7 @@ Level* World::load(fs::path directory,
auto level = new Level(world.get(), content, settings);
wfile->readPlayer(level->player);
level->inventories->store(level->player->getInventory());
world.release();
return level;
}