mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compiling and loading on macOS, load description

This commit is contained in:
Michael Steenbeek 2017-12-05 13:35:39 +01:00 committed by Gymnasiast
parent a1f360ab7d
commit 9ab0164b6f
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ namespace ObjectFactory
}
catch (Exception)
{
Console::Error::WriteLine("Unable to open or read '%s'", path);
Console::Error::WriteLine("Unable to open or read '%s'", path.c_str());
delete result;
result = nullptr;

22
src/openrct2/object/RideObject.cpp
View File

@ -540,16 +540,24 @@ void RideObject::ReadJson(IReadObjectContext * context, const json_t * root)
_legacyType.category[0] = RIDE_CATEGORY_SHOP;
auto stringTable = GetStringTable();
auto jsonStrings = json_object_get(root, "strings");
auto jsonDescription = json_object_get(jsonStrings, "description");
auto enDescription = json_object_get(jsonDescription, "en-GB");
stringTable->SetString(0, 0, "RCT1 toilets");
stringTable->SetString(1, 0, "Desc");
stringTable->SetString(1, 0, String::Duplicate(json_string_value(enDescription)));
stringTable->SetString(2, 0, "Capacity");
stringTable->SetString(3, 0, "Vehicle");
auto imageTable = GetImageTable();
auto g1 = *(gfx_get_g1_element(0x60000 + 64231));
// auto g12 = gfx_get_g1_element(0x60000 + 64322);
// imageTable->AddImage(g1, (size_t)(g12->offset - g1->offset));
g1.x_offset = 0;
g1.y_offset = 0;
imageTable->AddImage(&g1, 0x4000);
if (is_csg_loaded())
{
auto g1 = *(gfx_get_g1_element(0x60000 + 64231));
// auto g12 = gfx_get_g1_element(0x60000 + 64322);
// imageTable->AddImage(g1, (size_t)(g12->offset - g1->offset));
g1.x_offset = 0;
g1.y_offset = 0;
imageTable->AddImage(&g1, 0x4000);
}
}