From 90923fbb43bb7b3c8475bf560c461fbffd066edd Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 25 Jun 2016 17:09:56 +0100 Subject: [PATCH] add footpath objects --- openrct2.vcxproj | 2 ++ src/object/FootpathObject.cpp | 61 +++++++++++++++++++++++++++++++++++ src/object/FootpathObject.h | 41 +++++++++++++++++++++++ src/object/ObjectFactory.cpp | 4 +++ 4 files changed, 108 insertions(+) create mode 100644 src/object/FootpathObject.cpp create mode 100644 src/object/FootpathObject.h diff --git a/openrct2.vcxproj b/openrct2.vcxproj index 78e43f5706..064ab53ca0 100644 --- a/openrct2.vcxproj +++ b/openrct2.vcxproj @@ -119,6 +119,7 @@ + @@ -426,6 +427,7 @@ + diff --git a/src/object/FootpathObject.cpp b/src/object/FootpathObject.cpp new file mode 100644 index 0000000000..522da5d649 --- /dev/null +++ b/src/object/FootpathObject.cpp @@ -0,0 +1,61 @@ +#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers +/***************************************************************************** + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * OpenRCT2 is the work of many authors, a full list can be found in contributors.md + * For more information, visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * A full copy of the GNU General Public License can be found in licence.txt + *****************************************************************************/ +#pragma endregion + +#include "../core/IStream.hpp" +#include "FootpathObject.h" + +extern "C" +{ + #include "../drawing/drawing.h" + #include "../localisation/localisation.h" + #include "../world/footpath.h" +} + +enum OBJ_STRING_ID +{ + OBJ_STRING_ID_NAME, +}; + +void FootpathObject::ReadLegacy(IStream * stream) +{ + _legacyType.string_idx = stream->ReadValue(); + _legacyType.image = stream->ReadValue(); + _legacyType.bridge_image = stream->ReadValue(); + _legacyType.var_0A = stream->ReadValue(); + _legacyType.flags = stream->ReadValue(); + _legacyType.scrolling_mode = stream->ReadValue(); + stream->Seek(1, STREAM_SEEK_BEGIN); + + StringTable.Read(stream, OBJ_STRING_ID_NAME); + ImageTable.Read(stream); +} + +void FootpathObject::Load() +{ + _legacyType.string_idx = language_allocate_object_string(GetName()); + _legacyType.image = gfx_object_allocate_images(ImageTable.GetImages(), ImageTable.GetCount()); + _legacyType.bridge_image = _legacyType.image + 109; +} + +void FootpathObject::Unload() +{ + language_free_object_string(_legacyType.string_idx); +} + +const utf8 * FootpathObject::GetName() +{ + return StringTable.GetString(OBJ_STRING_ID_NAME); +} diff --git a/src/object/FootpathObject.h b/src/object/FootpathObject.h new file mode 100644 index 0000000000..096758e66d --- /dev/null +++ b/src/object/FootpathObject.h @@ -0,0 +1,41 @@ +#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers +/***************************************************************************** + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * OpenRCT2 is the work of many authors, a full list can be found in contributors.md + * For more information, visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * A full copy of the GNU General Public License can be found in licence.txt + *****************************************************************************/ +#pragma endregion + +#pragma once + +#include "Object.h" + +extern "C" +{ + #include "../world/footpath.h" +} + +class FootpathObject : public Object +{ +private: + rct_footpath_entry _legacyType; + +public: + explicit FootpathObject(const rct_object_entry &entry) : Object(entry) { }; + + void * GetLegacyData() override { return &_legacyType; } + + void ReadLegacy(IStream * stream) override; + void Load() override; + void Unload() override; + + const utf8 * GetName() override; +}; diff --git a/src/object/ObjectFactory.cpp b/src/object/ObjectFactory.cpp index 7cd94070fa..4f047cb3d5 100644 --- a/src/object/ObjectFactory.cpp +++ b/src/object/ObjectFactory.cpp @@ -18,6 +18,7 @@ #include "../core/Memory.hpp" #include "../core/MemoryStream.h" #include "EntranceObject.h" +#include "FootpathObject.h" #include "Object.h" #include "ObjectFactory.h" #include "StexObject.h" @@ -62,6 +63,9 @@ namespace ObjectFactory uint8 objectType = entry.flags & 0x0F; switch (objectType) { + case OBJECT_TYPE_PATHS: + result = new FootpathObject(entry); + break; case OBJECT_TYPE_PARK_ENTRANCE: result = new EntranceObject(entry); break;