mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #14843 from duncanspumpkin/boatTest
ImportExportTest: Add missing compare
This commit is contained in:
commit
422c654cab
|
@ -37,7 +37,7 @@
|
||||||
// This string specifies which version of network stream current build uses.
|
// This string specifies which version of network stream current build uses.
|
||||||
// It is used for making sure only compatible builds get connected, even within
|
// It is used for making sure only compatible builds get connected, even within
|
||||||
// single OpenRCT2 version.
|
// single OpenRCT2 version.
|
||||||
#define NETWORK_STREAM_VERSION "17"
|
#define NETWORK_STREAM_VERSION "18"
|
||||||
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
|
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
|
||||||
|
|
||||||
static Peep* _pickup_peep = nullptr;
|
static Peep* _pickup_peep = nullptr;
|
||||||
|
|
|
@ -4656,7 +4656,7 @@ void Vehicle::UpdateBoatLocation()
|
||||||
if (location.ToTileStart() == returnPosition.ToCoordsXY())
|
if (location.ToTileStart() == returnPosition.ToCoordsXY())
|
||||||
{
|
{
|
||||||
sub_state = 1;
|
sub_state = 1;
|
||||||
BoatLocation = location;
|
BoatLocation = location.ToTileStart();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4700,13 +4700,13 @@ void Vehicle::UpdateBoatLocation()
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
BoatLocation = trackLocation;
|
BoatLocation = trackLocation.ToTileStart();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
CoordsXY trackLocation = TrackLocation;
|
CoordsXY trackLocation = TrackLocation;
|
||||||
trackLocation += CoordsDirectionDelta[curDirection & 3];
|
trackLocation += CoordsDirectionDelta[curDirection & 3];
|
||||||
BoatLocation = trackLocation;
|
BoatLocation = trackLocation.ToTileStart();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -363,6 +363,7 @@ static void CompareSpriteDataVehicle(const Vehicle& left, const Vehicle& right)
|
||||||
COMPARE_FIELD(colours_extended);
|
COMPARE_FIELD(colours_extended);
|
||||||
COMPARE_FIELD(seat_rotation);
|
COMPARE_FIELD(seat_rotation);
|
||||||
COMPARE_FIELD(target_seat_rotation);
|
COMPARE_FIELD(target_seat_rotation);
|
||||||
|
COMPARE_FIELD(BoatLocation);
|
||||||
COMPARE_FIELD(IsCrashedVehicle);
|
COMPARE_FIELD(IsCrashedVehicle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue