mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge c2e9b84a27 into cecd4b04c8

This commit is contained in:
spacek531 2024-05-10 06:51:57 +00:00 committed by GitHub
parent cecd4b04c8 c2e9b84a27
commit 21a5c59dfd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/drawing/ImageImporter.cpp
View File

@ -11,6 +11,7 @@
#include "../core/Imaging.h"
#include "../core/Json.hpp"
#include "../util/Util.h"
#include <cstring>
#include <stdexcept>
@ -49,6 +50,7 @@ namespace OpenRCT2::Drawing
outElement.x_offset = meta.offset.x;
outElement.y_offset = meta.offset.y;
outElement.zoomed_offset = meta.zoomedOffset;
outElement.flags |= meta.importFlags & ImportFlags::NoDrawOnZoom ? G1_FLAG_NO_ZOOM_DRAW : 0;
ImageImporter::ImportResult result;
result.Element = outElement;
@ -390,15 +392,19 @@ namespace OpenRCT2::Drawing
auto palette = keepPalette ? Palette::KeepIndices : Palette::OpenRCT2;
auto raw = Json::GetString(input["format"]) == "raw";
auto flags = raw ? ImportFlags::None : ImportFlags::RLE;
auto flags = EnumValue(raw ? ImportFlags::None : ImportFlags::RLE);
flags |= Json::GetFlags<uint32_t>(
input,
{
{ "noDrawOnZoom", ImportFlags::NoDrawOnZoom },
});
auto srcX = Json::GetNumber<int16_t>(input["srcX"]);
auto srcY = Json::GetNumber<int16_t>(input["srcY"]);
auto srcWidth = Json::GetNumber<int16_t>(input["srcWidth"]);
auto srcHeight = Json::GetNumber<int16_t>(input["srcHeight"]);
auto zoomedOffset = Json::GetNumber<int32_t>(input["zoom"]);
return ImageImportMeta{ { xOffset, yOffset }, palette, flags, ImportMode::Default, { srcX, srcY },
return ImageImportMeta{ { xOffset, yOffset }, palette, static_cast<ImportFlags>(flags), ImportMode::Default, { srcX, srcY },
{ srcWidth, srcHeight }, zoomedOffset };
};
} // namespace OpenRCT2::Drawing

1
src/openrct2/drawing/ImageImporter.h
View File

@ -31,6 +31,7 @@ namespace OpenRCT2::Drawing
{
None = 0,
RLE = 1 << 1,
NoDrawOnZoom = 1 << 2,
};
enum class Palette : uint8_t