mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity

Remove hardcoded terrain style constants from RCT1 and MapGen

Browse Source
This commit is contained in:
Gymnasiast
2021-03-27 13:48:27 +01:00
parent 7a29350688
commit b3bbdcbfd5
20 changed files with 204 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/object/Object.cpp
View File

@@ -20,6 +20,7 @@
#include "../localisation/StringIds.h"
#include "../world/Scenery.h"
#include "ObjectLimits.h"
#include "ObjectRepository.h"
#include <algorithm>
#include <cstring>
@@ -301,6 +302,20 @@ std::unique_ptr<IStream> ObjectAsset::GetStream() const
return {};
}
ObjectEntryDescriptor::ObjectEntryDescriptor(const ObjectRepositoryItem& ori)
{
if (ori.Identifier != "")
{
Generation = ObjectGeneration::JSON;
Identifier = std::string(ori.Identifier);
}
else
{
Generation = ObjectGeneration::DAT;
Entry = ori.ObjectEntry;
}
}
#ifdef __WARN_SUGGEST_FINAL_METHODS__
# pragma GCC diagnostic pop
#endif