mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Improve editor handling of new object types

Browse Source
This commit is contained in:
Ted John
2021-04-03 16:25:22 +01:00
parent 9555d4fcf2
commit 68cb57fbb0
4 changed files with 94 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/Editor.cpp
View File

@@ -40,6 +40,7 @@
#include "world/Park.h"
#include "world/Scenery.h"
#include "world/Sprite.h"
#include "object/DefaultObjects.h"
#include <algorithm>
#include <array>
@@ -70,6 +71,12 @@ namespace Editor
// Reset loaded objects to just defaults
auto& objectManager = context->GetObjectManager();
objectManager.UnloadAll();
// Load minimum required objects (like surface and edge)
for (const auto& entry : MinimumRequiredObjects)
{
objectManager.LoadObject(entry);
}
}
/**
@@ -79,7 +86,6 @@ namespace Editor
void Load()
{
OpenRCT2::Audio::StopAll();
object_manager_unload_all_objects();
object_list_load();
OpenRCT2::GetContext()->GetGameState()->InitAll(150);
gScreenFlags = SCREEN_FLAGS_SCENARIO_EDITOR;