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

Fix testpaint

This commit is contained in:
Gymnasiast 2017-09-12 11:29:43 +02:00
parent a28509e24c
commit 3891b9874d
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/testpaint/TestTrack.cpp
View File

@ -49,7 +49,7 @@ public:
virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
rct_map_element *mapElement, rct_map_element *surfaceElement,
rct_ride *ride, rct_ride_entry *rideEntry
Ride *ride, rct_ride_entry *rideEntry
) abstract;
};
@ -69,7 +69,7 @@ public:
virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
rct_map_element *mapElement, rct_map_element *surfaceElement,
rct_ride *ride, rct_ride_entry *rideEntry
Ride *ride, rct_ride_entry *rideEntry
) override {
if (variant == 0) {
mapElement->properties.track.colour &= ~TRACK_ELEMENT_COLOUR_FLAG_CABLE_LIFT;
@ -95,7 +95,7 @@ public:
virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
rct_map_element *mapElement, rct_map_element *surfaceElement,
rct_ride *ride, rct_ride_entry *rideEntry
Ride *ride, rct_ride_entry *rideEntry
) override {
if (variant == 0) {
mapElement->type &= ~TRACK_ELEMENT_FLAG_CHAIN_LIFT;
@ -127,7 +127,7 @@ public:
virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
rct_map_element *mapElement, rct_map_element *surfaceElement,
rct_ride *ride, rct_ride_entry *rideEntry
Ride *ride, rct_ride_entry *rideEntry
) override {
if (variant == 0) {
mapElement->properties.track.colour &= ~TRACK_ELEMENT_COLOUR_FLAG_INVERTED;
@ -159,7 +159,7 @@ public:
virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant,
rct_map_element *mapElement, rct_map_element *surfaceElement,
rct_ride *ride, rct_ride_entry *rideEntry
Ride *ride, rct_ride_entry *rideEntry
) override {
ride->entrance_style = variant;
}
@ -186,7 +186,7 @@ static void CallOriginal(
direction,
height,
(int) mapElement,
rideIndex * sizeof(rct_ride),
rideIndex * sizeof(Ride),
trackSequence
);
}

6
test/testpaint/compat.c
View File

@ -30,7 +30,7 @@
rct_map_element *gMapElements = (rct_map_element *) RCT2_ADDRESS_MAP_ELEMENTS;
rct_map_element **gMapElementTilePointers = (rct_map_element **) RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS;
rct_ride *gRideList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, rct_ride);
Ride *gRideList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, Ride);
rct_sprite *sprite_list = RCT2_ADDRESS(RCT2_ADDRESS_SPRITE_LIST, rct_sprite);
sint16 gMapSizeUnits;
sint16 gMapBaseZ;
@ -88,7 +88,7 @@ void scenery_paint(paint_session * session, uint8 direction, int height, rct_map
void fence_paint(paint_session * session, uint8 direction, int height, rct_map_element *mapElement) { }
void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { }
rct_ride *get_ride(int index) {
Ride *get_ride(int index) {
if (index < 0 || index >= MAX_RIDES) {
log_error("invalid index %d for ride", index);
return NULL;
@ -104,7 +104,7 @@ rct_ride_entry *get_ride_entry(int index) {
return gRideEntries[index];
}
rct_ride_entry *get_ride_entry_by_ride(rct_ride *ride) {
rct_ride_entry *get_ride_entry_by_ride(Ride *ride) {
rct_ride_entry *type = get_ride_entry(ride->subtype);
if (type == NULL) {
log_error("Invalid ride subtype for ride");

2
test/testpaint/generate.cpp
View File

@ -1022,7 +1022,7 @@ private:
direction,
height,
(int)mapElement,
0 * sizeof(rct_ride),
0 * sizeof(Ride),
trackSequence
);
}

8
test/tests/RideRatings.cpp
View File

@ -23,7 +23,7 @@ protected:
{
for (int rideId = 0; rideId < MAX_RIDES; rideId++)
{
rct_ride * ride = get_ride(rideId);
Ride * ride = get_ride(rideId);
if (ride->type != RIDE_TYPE_NULL)
{
ride_ratings_update_ride(rideId);
@ -35,7 +35,7 @@ protected:
{
for (int rideId = 0; rideId < MAX_RIDES; rideId++)
{
rct_ride * ride = get_ride(rideId);
Ride * ride = get_ride(rideId);
if (ride->type != RIDE_TYPE_NULL)
{
std::string line = FormatRatings(ride);
@ -44,7 +44,7 @@ protected:
}
}
std::string FormatRatings(rct_ride * ride)
std::string FormatRatings(Ride * ride)
{
rating_tuple ratings = ride->ratings;
std::string line = String::StdFormat("%s: (%d, %d, %d)",
@ -82,7 +82,7 @@ TEST_F(RideRatings, all)
int expI = 0;
for (int rideId = 0; rideId < MAX_RIDES; rideId++)
{
rct_ride * ride = get_ride(rideId);
Ride * ride = get_ride(rideId);
if (ride->type != RIDE_TYPE_NULL)
{
std::string actual = FormatRatings(ride);