mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
cleanup World references
This commit is contained in:
parent
ac00c561ee
commit
c73b036099
18 changed files with 45 additions and 45 deletions
|
|
@ -283,7 +283,7 @@ void EngineController::createWorld(
|
|||
|
||||
// generator-based environments must die in 1.0
|
||||
bool genBasedEnv = false;
|
||||
if (auto genDef = generators.find(environment)) {
|
||||
if (generators.find(environment)) {
|
||||
genBasedEnv = true;
|
||||
}
|
||||
|
||||
|
|
@ -314,8 +314,8 @@ void EngineController::setLocalPlayer(int64_t player) {
|
|||
localPlayer = player;
|
||||
}
|
||||
|
||||
void EngineController::reopenWorld(World* world) {
|
||||
std::string name = world->wfile->getFolder().name();
|
||||
void EngineController::reopenWorld(World& world) {
|
||||
std::string name = world.wfile->getFolder().name();
|
||||
engine.onWorldClosed();
|
||||
openWorld(name, true);
|
||||
}
|
||||
|
|
@ -384,16 +384,16 @@ void EngineController::reconfigPacks(
|
|||
}
|
||||
} else {
|
||||
auto level = controller->getLevel();
|
||||
auto world = level->getWorld();
|
||||
auto& world = level->getWorld();
|
||||
controller->processBeforeQuit();
|
||||
controller->saveWorld();
|
||||
|
||||
auto names = PacksManager::getNames(world->getPacks());
|
||||
auto names = PacksManager::getNames(world.getPacks());
|
||||
auto& manager = contentControl.scan();
|
||||
reconfig_packs_inside(manager, names, packsToAdd, packsToRemove);
|
||||
|
||||
const auto& settings = engine.getSettings();
|
||||
auto& wfile = *world->wfile;
|
||||
auto& wfile = *world.wfile;
|
||||
if (!settings.debug.generatorTestMode.get()) {
|
||||
wfile.removeIndices(packsToRemove);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue