add footpath objects

This commit is contained in:
Ted John 2016-06-25 17:09:56 +01:00
parent 78e15b1d56
commit 90923fbb43
4 changed files with 108 additions and 0 deletions

View File

@ -119,6 +119,7 @@
<ClCompile Include="src\network\twitch.cpp" />
<ClCompile Include="src\object.c" />
<ClCompile Include="src\object\EntranceObject.cpp" />
<ClCompile Include="src\object\FootpathObject.cpp" />
<ClCompile Include="src\object\ImageTable.cpp" />
<ClCompile Include="src\object\Object.cpp" />
<ClCompile Include="src\object\ObjectFactory.cpp" />
@ -426,6 +427,7 @@
<ClInclude Include="src\network\NetworkKey.h" />
<ClInclude Include="src\object.h" />
<ClInclude Include="src\object\EntranceObject.h" />
<ClInclude Include="src\object\FootpathObject.h" />
<ClInclude Include="src\object\ImageTable.h" />
<ClInclude Include="src\object\Object.h" />
<ClInclude Include="src\object\ObjectFactory.h" />

View File

@ -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<rct_string_id>();
_legacyType.image = stream->ReadValue<rct_string_id>();
_legacyType.bridge_image = stream->ReadValue<uint32>();
_legacyType.var_0A = stream->ReadValue<uint8>();
_legacyType.flags = stream->ReadValue<uint8>();
_legacyType.scrolling_mode = stream->ReadValue<uint8>();
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);
}

View File

@ -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;
};

View File

@ -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;