mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity

Fix rebase errors

Browse Source
This commit is contained in:
Gymnasiast
2018-07-30 21:52:45 +02:00
parent c879bb5708
commit 8ff6831c57
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/object/ObjectFactory.cpp
View File

@@ -154,9 +154,6 @@ namespace ObjectFactory
static Object* CreateObjectFromJson(
IObjectRepository& objectRepository, const json_t* jRoot, const IFileDataRetriever* fileRetriever);
<<<<<<< HEAD
static void ReadObjectLegacy(Object* object, IReadObjectContext* context, IStream* stream)
=======
static uint8_t ParseSourceGame(const std::string &s)
{
static const std::unordered_map<std::string, uint8_t> LookupTable
@@ -176,8 +173,7 @@ namespace ObjectFactory
OBJECT_SOURCE_CUSTOM;
}
static void ReadObjectLegacy(Object * object, IReadObjectContext * context, IStream * stream)
>>>>>>> e280f8972... Attempt at showing secondary source game
static void ReadObjectLegacy(Object * object, IReadObjectContext* context, IStream* stream)
{
try
{