mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-05 19:11:50 +00:00
Merge branch 'main' into main
This commit is contained in:
commit
a78b5213e3
20 changed files with 256 additions and 43 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue