PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

World indices check

Browse Source
This commit is contained in:
MihailRis
2023-12-07 15:16:37 +03:00
parent 551b230b94
commit 636cb0c44c
12 changed files with 197 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/menu.cpp
+4 -5
View File
@@ -56,9 +56,8 @@ Panel* create_main_menu_panel(Engine* engine, PagesControl* menu) {
EngineSettings& settings = engine->getSettings();
auto folder = paths->getWorldsFolder()/u8path(name);
World* world = new World(name, folder, 42, settings);
auto screen = new LevelScreen(engine,
world->load(settings, engine->getContent()));
Level* level = World::load(folder, settings, engine->getContent());
auto screen = new LevelScreen(engine, level);
engine->setScreen(shared_ptr<Screen>(screen));
});
worldsPanel->add(button);
@@ -146,8 +145,8 @@ Panel* create_new_world_panel(Engine* engine, PagesControl* menu) {
auto folder = paths->getWorldsFolder()/u8path(nameutf8);
std::filesystem::create_directories(folder);
World* world = new World(nameutf8, folder, seed, settings);
auto screen = new LevelScreen(engine, world->create(settings, engine->getContent()));
Level* level = World::create(nameutf8, folder, seed, settings, engine->getContent());
auto screen = new LevelScreen(engine, level);
engine->setScreen(shared_ptr<Screen>(screen));
});
panel->add(button);
src/frontend/screens.cpp
+1 -1
View File
@@ -134,7 +134,7 @@ void LevelScreen::updateHotkeys() {
// TODO: remove in v0.16
if (Events::jpressed(keycode::F9)) {
blockid_t woodid = level->content->require("base:wood")->rt.id;
blockid_t woodid = level->content->requireBlock("base:wood")->rt.id;
for (size_t i = 0; i < level->chunks->volume; i++){
Chunk* chunk = level->chunks->chunks[i].get();
if (chunk) {