From 54f50c1f205f600dfca6e4dacfd43b74b79bd930 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 25 Jun 2016 22:59:24 +0100 Subject: [PATCH] add wall object loading --- openrct2.vcxproj | 2 + src/object/ObjectFactory.cpp | 4 ++ src/object/WallObject.cpp | 77 ++++++++++++++++++++++++++++++++++++ src/object/WallObject.h | 42 ++++++++++++++++++++ 4 files changed, 125 insertions(+) create mode 100644 src/object/WallObject.cpp create mode 100644 src/object/WallObject.h diff --git a/openrct2.vcxproj b/openrct2.vcxproj index 2bbbb5b06a..459f950a37 100644 --- a/openrct2.vcxproj +++ b/openrct2.vcxproj @@ -130,6 +130,7 @@ + @@ -442,6 +443,7 @@ + diff --git a/src/object/ObjectFactory.cpp b/src/object/ObjectFactory.cpp index f5ed13dcc1..87c5310c46 100644 --- a/src/object/ObjectFactory.cpp +++ b/src/object/ObjectFactory.cpp @@ -26,6 +26,7 @@ #include "RideObject.h" #include "SmallSceneryObject.h" #include "StexObject.h" +#include "WallObject.h" extern "C" { @@ -76,6 +77,9 @@ namespace ObjectFactory case OBJECT_TYPE_LARGE_SCENERY: result = new LargeSceneryObject(entry); break; + case OBJECT_TYPE_WALLS: + result = new WallObject(entry); + break; case OBJECT_TYPE_PATHS: result = new FootpathObject(entry); break; diff --git a/src/object/WallObject.cpp b/src/object/WallObject.cpp new file mode 100644 index 0000000000..f4ca173b02 --- /dev/null +++ b/src/object/WallObject.cpp @@ -0,0 +1,77 @@ +#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 "WallObject.h" + +extern "C" +{ + #include "../drawing/drawing.h" + #include "../localisation/localisation.h" +} + +enum OBJ_STRING_ID +{ + OBJ_STRING_ID_NAME, +}; + +void WallObject::ReadLegacy(IStream * stream) +{ + _legacyType.name = stream->ReadValue(); + _legacyType.image = stream->ReadValue(); + + _legacyType.wall.tool_id = stream->ReadValue(); + _legacyType.wall.flags = stream->ReadValue(); + _legacyType.wall.height = stream->ReadValue(); + _legacyType.wall.flags2 = stream->ReadValue(); + _legacyType.wall.price = stream->ReadValue(); + _legacyType.wall.scenery_tab_id = stream->ReadValue(); + _legacyType.wall.var_0D = stream->ReadValue(); + + StringTable.Read(stream, OBJ_STRING_ID_NAME); + + _sceneryTabEntry = stream->ReadValue(); + + ImageTable.Read(stream); +} + +void WallObject::Load() +{ + _legacyType.name = language_allocate_object_string(GetName()); + _legacyType.image = gfx_object_allocate_images(ImageTable.GetImages(), ImageTable.GetCount()); + + _legacyType.small_scenery.scenery_tab_id = 0xFF; + if ((_sceneryTabEntry.flags & 0xFF) != 0xFF) + { + uint8 entryType, entryIndex; + if (find_object_in_entry_group(&_sceneryTabEntry, &entryType, &entryIndex)) + { + _legacyType.small_scenery.scenery_tab_id = entryIndex; + } + } +} + +void WallObject::Unload() +{ + language_free_object_string(_legacyType.name); + gfx_object_free_images(_legacyType.image, ImageTable.GetCount()); +} + +const utf8 * WallObject::GetName() +{ + return StringTable.GetString(OBJ_STRING_ID_NAME); +} diff --git a/src/object/WallObject.h b/src/object/WallObject.h new file mode 100644 index 0000000000..af32bcaa38 --- /dev/null +++ b/src/object/WallObject.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 WallObject : public Object +{ +private: + rct_scenery_entry _legacyType; + rct_object_entry _sceneryTabEntry; + +public: + explicit WallObject(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; +};