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

Fix #6447: Rename friction to mass

Browse Source
This commit is contained in:
Gymnasiast
2017-12-17 18:00:42 +01:00
committed by Michael Steenbeek
parent 0c1c5938d6
commit 44651defa7
12 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/ride/CableLift.cpp
View File

@@ -55,7 +55,7 @@ rct_vehicle * cable_lift_segment_create(sint32 rideIndex,
current->sprite_width = 10;
current->sprite_height_negative = 10;
current->sprite_height_positive = 10;
current->friction = 100;
current->mass = 100;
current->num_seats = 0;
current->speed = 20;
current->powered_acceleration = 80;
@@ -503,7 +503,7 @@ sint32 cable_lift_update_track_motion(rct_vehicle * cableLift)
}
uint32 vehicleCount = 0;
uint16 frictionTotal = 0;
uint16 massTotal = 0;
sint32 accelerationTotal = 0;
for (uint16 spriteId = cableLift->sprite_index; spriteId != SPRITE_INDEX_NULL;)
@@ -511,7 +511,7 @@ sint32 cable_lift_update_track_motion(rct_vehicle * cableLift)
rct_vehicle * vehicle = GET_VEHICLE(spriteId);
vehicleCount++;
frictionTotal += vehicle->friction;
massTotal += vehicle->mass;
accelerationTotal = add_clamp_sint32(accelerationTotal, vehicle->acceleration);
spriteId = vehicle->next_vehicle_on_train;
@@ -527,7 +527,7 @@ sint32 cable_lift_update_track_motion(rct_vehicle * cableLift)
edx = -edx;
}
edx >>= 4;
newAcceleration -= edx / frictionTotal;
newAcceleration -= edx / massTotal;
cableLift->acceleration = newAcceleration;
return _vehicleMotionTrackFlags;