diff --git a/openrct2.vcxproj b/openrct2.vcxproj index 459f950a37..361dc624e3 100644 --- a/openrct2.vcxproj +++ b/openrct2.vcxproj @@ -118,6 +118,7 @@ + @@ -431,6 +432,7 @@ + diff --git a/src/object/BannerObject.cpp b/src/object/BannerObject.cpp new file mode 100644 index 0000000000..76a3ef2c53 --- /dev/null +++ b/src/object/BannerObject.cpp @@ -0,0 +1,74 @@ +#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 "../core/Memory.hpp" +#include "BannerObject.h" + +extern "C" +{ + #include "../drawing/drawing.h" + #include "../localisation/localisation.h" +} + +enum OBJ_STRING_ID +{ + OBJ_STRING_ID_NAME, +}; + +void BannerObject::ReadLegacy(IStream * stream) +{ + _legacyType.name = stream->ReadValue(); + _legacyType.image = stream->ReadValue(); + + _legacyType.banner.scrolling_mode = stream->ReadValue(); + _legacyType.banner.flags = stream->ReadValue(); + _legacyType.banner.price = stream->ReadValue(); + _legacyType.banner.scenery_tab_id = stream->ReadValue(); + + StringTable.Read(stream, OBJ_STRING_ID_NAME); + + _sceneryTabEntry = stream->ReadValue(); + + ImageTable.Read(stream); +} + +void BannerObject::Load() +{ + _legacyType.name = language_allocate_object_string(GetName()); + _legacyType.image = gfx_object_allocate_images(ImageTable.GetImages(), ImageTable.GetCount()); + + _legacyType.banner.scenery_tab_id = 0xFF; + if ((_sceneryTabEntry.flags & 0xFF) != 0xFF) + { + uint8 entryType, entryIndex; + if (find_object_in_entry_group(&_sceneryTabEntry, &entryType, &entryIndex)) + { + _legacyType.banner.scenery_tab_id = entryIndex; + } + } +} + +void BannerObject::Unload() +{ + language_free_object_string(_legacyType.name); + gfx_object_free_images(_legacyType.image, ImageTable.GetCount()); +} + +const utf8 * BannerObject::GetName() +{ + return StringTable.GetString(OBJ_STRING_ID_NAME); +} diff --git a/src/object/BannerObject.h b/src/object/BannerObject.h new file mode 100644 index 0000000000..afb701f560 --- /dev/null +++ b/src/object/BannerObject.h @@ -0,0 +1,42 @@ +#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/scenery.h" +} + +class BannerObject : public Object +{ +private: + rct_scenery_entry _legacyType; + rct_object_entry _sceneryTabEntry; + +public: + explicit BannerObject(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 87c5310c46..4f7c0041d2 100644 --- a/src/object/ObjectFactory.cpp +++ b/src/object/ObjectFactory.cpp @@ -17,6 +17,7 @@ #include "../core/FileStream.hpp" #include "../core/Memory.hpp" #include "../core/MemoryStream.h" +#include "BannerObject.h" #include "EntranceObject.h" #include "FootpathItemObject.h" #include "FootpathObject.h" @@ -80,6 +81,9 @@ namespace ObjectFactory case OBJECT_TYPE_WALLS: result = new WallObject(entry); break; + case OBJECT_TYPE_BANNERS: + result = new BannerObject(entry); + break; case OBJECT_TYPE_PATHS: result = new FootpathObject(entry); break;