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

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

12
src/openrct2/object/SceneryGroupObject.h
View File

@@ -16,22 +16,20 @@
#pragma once
#include "Object.h"
#include <vector>
#include "../world/Scenery.h"
#include "Object.h"
struct ObjectRepositoryItem;
class SceneryGroupObject final : public Object
{
private:
rct_scenery_group_entry _legacyType = { 0 };
uint32 _numItems = 0;
rct_object_entry * _items = nullptr;
rct_scenery_group_entry _legacyType = { 0 };
std::vector<rct_object_entry> _items;
public:
explicit SceneryGroupObject(const rct_object_entry &entry) : Object(entry) { }
~SceneryGroupObject();
void * GetLegacyData() override { return &_legacyType; }
@@ -45,5 +43,5 @@ public:
void SetRepositoryItem(ObjectRepositoryItem * item) const override;
private:
void ReadItems(IStream * stream);
static std::vector<rct_object_entry> ReadItems(IStream * stream);
};