Skip to content

Commit 6b780a8

Browse files
committed
- fix tyre track sides being swapped
1 parent 4086bba commit 6b780a8

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

src_rebuild/Game/C/handling.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,10 +1490,6 @@ void CheckCarEffects(CAR_DATA* cp, int player_id)
14901490
char tracks_and_smoke;
14911491
char channel, desired_skid, desired_wheel;
14921492

1493-
wheels_on_ground = 0;
1494-
lay_down_tracks = 0;
1495-
tracks_and_smoke = 0;
1496-
14971493
if (cp->controlType != CONTROL_TYPE_PLAYER &&
14981494
cp->controlType != CONTROL_TYPE_LEAD_AI &&
14991495
cp->controlType != CONTROL_TYPE_CUTSCENE)
@@ -1508,6 +1504,10 @@ void CheckCarEffects(CAR_DATA* cp, int player_id)
15081504
// [A] do hubcaps here
15091505
HandlePlayerHubcaps(player_id);
15101506

1507+
wheels_on_ground = 0;
1508+
lay_down_tracks = 0;
1509+
tracks_and_smoke = 0;
1510+
15111511
for (cnt = 0; cnt < 4; cnt++)
15121512
{
15131513
if (cp->hd.wheel[cnt].susCompression != 0)
@@ -1678,10 +1678,10 @@ void CheckCarEffects(CAR_DATA* cp, int player_id)
16781678
{
16791679
#if MAX_TYRE_TRACK_WHEELS == 4
16801680
ADD_WHEEL_TYRE_TRACK(0, 0)
1681-
ADD_WHEEL_TYRE_TRACK(2, 2)
1681+
ADD_WHEEL_TYRE_TRACK(2, 2)
16821682
#else
16831683
ADD_WHEEL_TYRE_TRACK(0, 0)
1684-
ADD_WHEEL_TYRE_TRACK(2, 1)
1684+
ADD_WHEEL_TYRE_TRACK(2, 1)
16851685
#endif
16861686
}
16871687
else
@@ -1699,7 +1699,7 @@ void CheckCarEffects(CAR_DATA* cp, int player_id)
16991699
if (lay_down_tracks & 2) // front
17001700
{
17011701
ADD_WHEEL_TYRE_TRACK(1, 1)
1702-
ADD_WHEEL_TYRE_TRACK(3, 3)
1702+
ADD_WHEEL_TYRE_TRACK(3, 3)
17031703
}
17041704
else
17051705
{

src_rebuild/Game/C/shadow.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,20 @@ void GetTyreTrackPositions(CAR_DATA *cp, int player_id)
7676
CarPos.vz = cp->hd.where.t[2];
7777

7878
car_cos = cp->ap.carCos;
79-
SetRotMatrix(&cp->hd.drawCarMat);
79+
SetRotMatrix(&cp->hd.where);
8080

8181
steps = 4 / MAX_TYRE_TRACK_WHEELS;
8282

8383
for (loop = 0; loop < 4; loop += steps)
8484
{
85+
WheelPos.vx = car_cos->wheelDisp[loop].vx;
8586
if (loop & 2)
86-
WheelPos.vx = car_cos->wheelDisp[loop].vx + 17;
87+
WheelPos.vx += 17;
8788
else
88-
WheelPos.vx = car_cos->wheelDisp[loop].vx - 17;
89+
WheelPos.vx -= 17;
8990

9091
WheelPos.vy = 0;
91-
WheelPos.vz = -car_cos->wheelDisp[loop + 1 & 3].vz;
92+
WheelPos.vz = car_cos->wheelDisp[loop + 1 & 3].vz;
9293

9394
_MatrixRotate(&WheelPos);
9495

0 commit comments

Comments
 (0)