mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 02:35:46 +01:00
Code Issues Releases Wiki Activity

Read more from JSON, attempt at supporting more types of stalls

Browse Source
This commit is contained in:
Michael Steenbeek
2017-12-05 15:12:28 +01:00
committed by Gymnasiast
parent 3ffdfd1e5d
commit e3b202989f
3 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,7 +219,18 @@ namespace ObjectFactory
auto objectType = std::string(json_string_value(jObjectType));
if (objectType == "ride")
{
std::string objectName = "#RCT1TOI";
std::string objectName;
const char * id = json_string_value(json_object_get(jRoot, "id"));
if (String::Equals(id, "rct1.icecr"))
{
objectName = "#RCT1ICE";
}
else
{
objectName = "#RCT1TOI";
}
rct_object_entry entry = { 0 };
memcpy(entry.name, objectName.c_str(), 8);
result = new RideObject(entry);

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

@@ -537,20 +537,42 @@ uint8 RideObject::CalculateNumHorizontalFrames(const rct_ride_entry_vehicle * ve
void RideObject::ReadJson(IReadObjectContext * context, const json_t * root)
{
printf("RideObject::ReadJson(context, root)\n");
_legacyType.ride_type[0] = RIDE_TYPE_TOILETS;
const char * rideType = json_string_value(json_object_get(json_object_get(root, "properties"), "type"));
const char * category = json_string_value(json_object_get(json_object_get(root, "properties"), "category"));
sint32 previewImg = 0;
sint32 imageStart = 0;
if (String::Equals(rideType, "restroom") ||
String::Equals(rideType, "toilets")) // object tool should be fixed to generate toilets, not restroom.
{
_legacyType.ride_type[0] = RIDE_TYPE_TOILETS;
previewImg = SPR_CSG_RIDE_PREVIEW_TOILETS;
imageStart = SPR_CSG_TOILETS_BEGIN;
}
else if (String::Equals(rideType, "foodstall"))
{
_legacyType.ride_type[0] = RIDE_TYPE_FOOD_STALL;
previewImg = SPR_CSG_RIDE_PREVIEW_ICE_CREAM_STALL;
imageStart = 61281;
}
_legacyType.ride_type[1] = RIDE_TYPE_NULL;
_legacyType.ride_type[2] = RIDE_TYPE_NULL;
_legacyType.category[0] = RIDE_CATEGORY_SHOP;
_legacyType.category[1] = RIDE_CATEGORY_SHOP;
if (String::Equals(rideType, "stall"))
{
_legacyType.category[0] = RIDE_CATEGORY_SHOP;
_legacyType.category[1] = RIDE_CATEGORY_SHOP;
}
_legacyType.flags |= RIDE_ENTRY_FLAG_SEPARATE_RIDE;
auto stringTable = GetStringTable();
auto jsonStrings = json_object_get(root, "strings");
auto jsonName = json_object_get(jsonStrings, "name");
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, String::Duplicate(json_string_value(enDescription)));
stringTable->SetString(0, 0, json_string_value(json_object_get(jsonName, "en-GB")));
stringTable->SetString(1, 0, json_string_value(json_object_get(jsonDescription, "en-GB")));
stringTable->SetString(2, 0, "Capacity");
stringTable->SetString(3, 0, "Vehicle");
@@ -558,8 +580,8 @@ void RideObject::ReadJson(IReadObjectContext * context, const json_t * root)
if (is_csg_loaded())
{
auto g1 = *(gfx_get_g1_element(SPR_CSG_RIDE_PREVIEW_TOILETS));
//auto g12 = *(gfx_get_g1_element(SPR_CSG_RIDE_PREVIEW_TOILETS + 1));
auto g1 = *(gfx_get_g1_element(previewImg));
//auto g12 = *(gfx_get_g1_element(previewImg + 1));
g1.x_offset = 0;
g1.y_offset = 0;
@@ -570,6 +592,6 @@ void RideObject::ReadJson(IReadObjectContext * context, const json_t * root)
rct_ride_entry_vehicle * vehicle0 = &_legacyType.vehicles[0];
vehicle0->flags |= VEHICLE_SPRITE_FLAG_FLAT;
vehicle0->base_image_id = SPR_CSG_TOILETS_BEGIN;
vehicle0->base_image_id = imageStart;
}
}

1
src/openrct2/sprites.h
View File

@@ -878,6 +878,7 @@ enum {
SPR_CSG_TOILETS_BEGIN = SPR_CSG_BEGIN + 61289,
SPR_CSG_RIDE_PREVIEWS_BEGIN = SPR_CSG_BEGIN + 64195,
SPR_CSG_RIDE_PREVIEW_ICE_CREAM_STALL = SPR_CSG_RIDE_PREVIEWS_BEGIN + RCT1_RIDE_TYPE_ICE_CREAM_STALL,
SPR_CSG_RIDE_PREVIEW_TOILETS = SPR_CSG_RIDE_PREVIEWS_BEGIN + RCT1_RIDE_TYPE_TOILETS,
};