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

Remove Memory::Duplicate and Memory::DuplicateArray (#7142)

Browse Source
This commit is contained in:
Ted John
2018-02-07 19:56:46 +00:00
committed by GitHub
parent 04ea015302
commit 142facb8a3
9 changed files with 44 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/object/SmallSceneryObject.h
View File

@@ -16,19 +16,18 @@
#pragma once
#include "SceneryObject.h"
#include <vector>
#include "../world/Scenery.h"
#include "SceneryObject.h"
class SmallSceneryObject final : public SceneryObject
{
private:
rct_scenery_entry _legacyType = { 0 };
uint8 * _frameOffsets = nullptr;
std::vector<uint8> _frameOffsets;
public:
explicit SmallSceneryObject(const rct_object_entry &entry) : SceneryObject(entry) { }
~SmallSceneryObject();
void * GetLegacyData() override { return &_legacyType; }
@@ -39,7 +38,7 @@ public:
void DrawPreview(rct_drawpixelinfo * dpi, sint32 width, sint32 height) const override;
private:
static uint8 * ReadFrameOffsets(IStream * stream);
static std::vector<uint8> ReadFrameOffsets(IStream * stream);
void PerformFixes();
rct_object_entry GetScgPiratHeader();
rct_object_entry GetScgMineHeader();