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

Merge pull request #6068 from duncanspumpkin/fix_5629 

Fix 5629: Issue with tower ride modes approach to station
This commit is contained in:
Ted John 2017-07-29 09:33:46 +01:00 committed by GitHub
parent d23e6fe5a9 12b6d48d46
commit 6460f0afbb
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -8,6 +8,7 @@
- Fix: [#3589] Crash due to invalid footpathEntry in path_paint
- Fix: [#4455] Crash in window_sign_invalidate due to original bug
- Fix: [#4931] Crash in path_paint - footpathentry was null
- Fix: [#5629] Issue with tower ride modes approach to station - incorrect sum caused sawtooth in velocity
- Fix: [#5768] Prevent loading non-existent title sequences.
- Fix: [#5858] Crash when using custom ride with no colour presets.
- Fix: [#5872] Incorrect OpenGL rendering of masked sprites

2
src/openrct2/network/network.h
View File

@ -55,7 +55,7 @@ extern "C" {
// This define specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "11"
#define NETWORK_STREAM_VERSION "12"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
#ifdef __cplusplus

2
src/openrct2/ride/vehicle.c
View File

@ -1707,7 +1707,7 @@ static void vehicle_update_moving_to_end_of_station(rct_vehicle *vehicle){
vehicle->acceleration = -3298;
}
if (vehicle->velocity < -131940){
vehicle->velocity = vehicle->velocity / 16;
vehicle->velocity -= vehicle->velocity / 16;
vehicle->acceleration = 0;
}