mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-05 02:51:49 +00:00
Merge branch 'dev' into pathfinding
This commit is contained in:
commit
ca1b761c8c
57 changed files with 818 additions and 207 deletions
|
|
@ -97,7 +97,6 @@ LevelScreen::LevelScreen(
|
|||
animator->addAnimations(assets.getAnimations());
|
||||
|
||||
loadDecorations();
|
||||
initializeContent();
|
||||
}
|
||||
|
||||
LevelScreen::~LevelScreen() {
|
||||
|
|
@ -112,6 +111,10 @@ LevelScreen::~LevelScreen() {
|
|||
engine.getPaths().setCurrentWorldFolder("");
|
||||
}
|
||||
|
||||
void LevelScreen::onOpen() {
|
||||
initializeContent();
|
||||
}
|
||||
|
||||
void LevelScreen::initializeContent() {
|
||||
auto& content = controller->getLevel()->content;
|
||||
for (auto& entry : content.getPacks()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue