mirror of https://github.com/OpenRCT2/OpenRCT2.git
add wall object loading
This commit is contained in:
parent
958dfa6623
commit
54f50c1f20
|
@ -130,6 +130,7 @@
|
|||
<ClCompile Include="src\object\SmallSceneryObject.cpp" />
|
||||
<ClCompile Include="src\object\StexObject.cpp" />
|
||||
<ClCompile Include="src\object\StringTable.cpp" />
|
||||
<ClCompile Include="src\object\WallObject.cpp" />
|
||||
<ClCompile Include="src\object_list.c" />
|
||||
<ClCompile Include="src\openrct2.c" />
|
||||
<ClCompile Include="src\paint\map_element\banner.c" />
|
||||
|
@ -442,6 +443,7 @@
|
|||
<ClInclude Include="src\object\SmallSceneryObject.h" />
|
||||
<ClInclude Include="src\object\StexObject.h" />
|
||||
<ClInclude Include="src\object\StringTable.h" />
|
||||
<ClInclude Include="src\object\WallObject.h" />
|
||||
<ClInclude Include="src\object_list.h" />
|
||||
<ClInclude Include="src\openrct2.h" />
|
||||
<ClInclude Include="src\paint\map_element\map_element.h" />
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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<rct_string_id>();
|
||||
_legacyType.image = stream->ReadValue<uint32>();
|
||||
|
||||
_legacyType.wall.tool_id = stream->ReadValue<uint8>();
|
||||
_legacyType.wall.flags = stream->ReadValue<uint8>();
|
||||
_legacyType.wall.height = stream->ReadValue<uint8>();
|
||||
_legacyType.wall.flags2 = stream->ReadValue<uint8>();
|
||||
_legacyType.wall.price = stream->ReadValue<uint16>();
|
||||
_legacyType.wall.scenery_tab_id = stream->ReadValue<uint8>();
|
||||
_legacyType.wall.var_0D = stream->ReadValue<uint8>();
|
||||
|
||||
StringTable.Read(stream, OBJ_STRING_ID_NAME);
|
||||
|
||||
_sceneryTabEntry = stream->ReadValue<rct_object_entry>();
|
||||
|
||||
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);
|
||||
}
|
|
@ -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;
|
||||
};
|
Loading…
Reference in New Issue