diff --git a/openrct2.vcxproj b/openrct2.vcxproj
index 064ab53ca0..8690833636 100644
--- a/openrct2.vcxproj
+++ b/openrct2.vcxproj
@@ -119,6 +119,7 @@
+
@@ -427,6 +428,7 @@
+
diff --git a/src/object/EntranceObject.cpp b/src/object/EntranceObject.cpp
index edd1db42b5..fc9ee35a40 100644
--- a/src/object/EntranceObject.cpp
+++ b/src/object/EntranceObject.cpp
@@ -48,6 +48,7 @@ void EntranceObject::Load()
void EntranceObject::Unload()
{
language_free_object_string(_legacyType.string_idx);
+ gfx_object_free_images(_legacyType.image_id, ImageTable.GetCount());
}
const utf8 * EntranceObject::GetName()
diff --git a/src/object/FootpathItemObject.cpp b/src/object/FootpathItemObject.cpp
new file mode 100644
index 0000000000..6538292425
--- /dev/null
+++ b/src/object/FootpathItemObject.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 "FootpathItemObject.h"
+
+extern "C"
+{
+ #include "../drawing/drawing.h"
+ #include "../localisation/localisation.h"
+}
+
+enum OBJ_STRING_ID
+{
+ OBJ_STRING_ID_NAME,
+};
+
+void FootpathItemObject::ReadLegacy(IStream * stream)
+{
+ _legacyType.name = stream->ReadValue();
+ _legacyType.image = stream->ReadValue();
+ _legacyType.path_bit.flags = stream->ReadValue();
+ _legacyType.path_bit.draw_type = stream->ReadValue();
+ _legacyType.path_bit.tool_id = stream->ReadValue();
+ _legacyType.path_bit.price = stream->ReadValue();
+ _legacyType.path_bit.scenery_tab_id = stream->ReadValue();
+ stream->Seek(0, STREAM_SEEK_BEGIN);
+
+ StringTable.Read(stream, OBJ_STRING_ID_NAME);
+
+ _sceneryTabEntry = stream->ReadValue();
+
+ ImageTable.Read(stream);
+}
+
+void FootpathItemObject::Load()
+{
+ _legacyType.name = language_allocate_object_string(GetName());
+ _legacyType.image = gfx_object_allocate_images(ImageTable.GetImages(), ImageTable.GetCount());
+
+ _legacyType.path_bit.scenery_tab_id = 0xFF;
+ if ((_sceneryTabEntry.flags & 0xFF) != 0xFF)
+ {
+ uint8 entryType, entryIndex;
+ if (find_object_in_entry_group(&_sceneryTabEntry, &entryType, &entryIndex))
+ {
+ _legacyType.path_bit.scenery_tab_id = entryIndex;
+ }
+ }
+}
+
+void FootpathItemObject::Unload()
+{
+ language_free_object_string(_legacyType.name);
+ gfx_object_free_images(_legacyType.image, ImageTable.GetCount());
+}
+
+const utf8 * FootpathItemObject::GetName()
+{
+ return StringTable.GetString(OBJ_STRING_ID_NAME);
+}
diff --git a/src/object/FootpathItemObject.h b/src/object/FootpathItemObject.h
new file mode 100644
index 0000000000..83ed82bd55
--- /dev/null
+++ b/src/object/FootpathItemObject.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 FootpathItemObject : public Object
+{
+private:
+ rct_scenery_entry _legacyType;
+ rct_object_entry _sceneryTabEntry;
+
+public:
+ explicit FootpathItemObject(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/FootpathObject.cpp b/src/object/FootpathObject.cpp
index 522da5d649..55b9e726b5 100644
--- a/src/object/FootpathObject.cpp
+++ b/src/object/FootpathObject.cpp
@@ -53,6 +53,7 @@ void FootpathObject::Load()
void FootpathObject::Unload()
{
language_free_object_string(_legacyType.string_idx);
+ gfx_object_free_images(_legacyType.image, ImageTable.GetCount());
}
const utf8 * FootpathObject::GetName()
diff --git a/src/object/ObjectFactory.cpp b/src/object/ObjectFactory.cpp
index 4f047cb3d5..e91fa07d5b 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 "FootpathItemObject.h"
#include "FootpathObject.h"
#include "Object.h"
#include "ObjectFactory.h"
@@ -66,6 +67,9 @@ namespace ObjectFactory
case OBJECT_TYPE_PATHS:
result = new FootpathObject(entry);
break;
+ case OBJECT_TYPE_PATH_BITS:
+ result = new FootpathItemObject(entry);
+ break;
case OBJECT_TYPE_PARK_ENTRANCE:
result = new EntranceObject(entry);
break;