mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 09:44:52 +01:00
Code Issues Releases Wiki Activity

Fix #11912: Update active palette on selection

Browse Source
This commit is contained in:
Basssiiie
2021-01-18 21:25:57 +01:00
committed by GitHub
parent bd27046142
commit 813b111710
3 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -13,6 +13,7 @@
#include "Editor.h"
#include "Game.h"
#include "OpenRCT2.h"
#include "drawing/Drawing.h"
#include "localisation/Localisation.h"
#include "management/Research.h"
#include "object/DefaultObjects.h"
@@ -38,6 +39,7 @@ static void setup_track_designer_objects();
static void setup_track_manager_objects();
static void window_editor_object_selection_select_default_objects();
static void SelectDesignerObjects();
static void ReplaceSelectedWaterPalette(const ObjectRepositoryItem* item);
/**
*
@@ -370,6 +372,32 @@ static void SelectDesignerObjects()
}
}
/**
* Replaces the previously selected water palette with the palette in the specified item immediately.
*/
static void ReplaceSelectedWaterPalette(const ObjectRepositoryItem* item)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* oldPalette = objectManager.GetLoadedObject(ObjectType::Water, 0);
if (oldPalette != nullptr)
{
const std::vector<rct_object_entry> oldEntries = { *(oldPalette->GetObjectEntry()) };
objectManager.UnloadObjects(oldEntries);
}
const rct_object_entry* newPaletteEntry = &item->ObjectEntry;
if (objectManager.GetLoadedObject(newPaletteEntry) != nullptr || objectManager.LoadObject(newPaletteEntry) != nullptr)
{
load_palette();
}
else
{
log_error("Failed to load selected palette %.8s", newPaletteEntry->name);
}
}
/**
*
* rct2: 0x006AA770
@@ -513,6 +541,11 @@ bool window_editor_object_selection_select_object(uint8_t isMasterObject, int32_
}
}
}
else if (objectType == ObjectType::Water)
{
// Replace old palette with newly selected palette immediately.
ReplaceSelectedWaterPalette(item);
}
if (isMasterObject != 0 && !(flags & INPUT_FLAG_EDITOR_OBJECT_1))
{