Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-25 11:52:32 +01:00
Code Issues Projects Releases Wiki Activity

- fix tyre track sides being swapped

Browse Source
This commit is contained in:
InspirationByte 2022-02-04 21:15:00 +03:00
parent 4086bbaf9c
commit 6b780a822b
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src_rebuild/Game/C/handling.c
View File

@ -1490,10 +1490,6 @@ void CheckCarEffects(CAR_DATA* cp, int player_id)
char tracks_and_smoke; char tracks_and_smoke;
char channel, desired_skid, desired_wheel; char channel, desired_skid, desired_wheel;
wheels_on_ground = 0;
lay_down_tracks = 0;
tracks_and_smoke = 0;
if (cp->controlType != CONTROL_TYPE_PLAYER && if (cp->controlType != CONTROL_TYPE_PLAYER &&
cp->controlType != CONTROL_TYPE_LEAD_AI && cp->controlType != CONTROL_TYPE_LEAD_AI &&
cp->controlType != CONTROL_TYPE_CUTSCENE) cp->controlType != CONTROL_TYPE_CUTSCENE)
@ -1508,6 +1504,10 @@ void CheckCarEffects(CAR_DATA* cp, int player_id)
// [A] do hubcaps here // [A] do hubcaps here
HandlePlayerHubcaps(player_id); HandlePlayerHubcaps(player_id);
wheels_on_ground = 0;
lay_down_tracks = 0;
tracks_and_smoke = 0;
for (cnt = 0; cnt < 4; cnt++) for (cnt = 0; cnt < 4; cnt++)
{ {
if (cp->hd.wheel[cnt].susCompression != 0) if (cp->hd.wheel[cnt].susCompression != 0)
@ -1678,10 +1678,10 @@ void CheckCarEffects(CAR_DATA* cp, int player_id)
{ {
#if MAX_TYRE_TRACK_WHEELS == 4 #if MAX_TYRE_TRACK_WHEELS == 4
ADD_WHEEL_TYRE_TRACK(0, 0) ADD_WHEEL_TYRE_TRACK(0, 0)
ADD_WHEEL_TYRE_TRACK(2, 2) ADD_WHEEL_TYRE_TRACK(2, 2)
#else #else
ADD_WHEEL_TYRE_TRACK(0, 0) ADD_WHEEL_TYRE_TRACK(0, 0)
ADD_WHEEL_TYRE_TRACK(2, 1) ADD_WHEEL_TYRE_TRACK(2, 1)
#endif #endif
} }
else else
@ -1699,7 +1699,7 @@ void CheckCarEffects(CAR_DATA* cp, int player_id)
if (lay_down_tracks & 2) // front if (lay_down_tracks & 2) // front
{ {
ADD_WHEEL_TYRE_TRACK(1, 1) ADD_WHEEL_TYRE_TRACK(1, 1)
ADD_WHEEL_TYRE_TRACK(3, 3) ADD_WHEEL_TYRE_TRACK(3, 3)
} }
else else
{ {

9
src_rebuild/Game/C/shadow.c
View File

@ -76,19 +76,20 @@ void GetTyreTrackPositions(CAR_DATA *cp, int player_id)
CarPos.vz = cp->hd.where.t[2]; CarPos.vz = cp->hd.where.t[2];
car_cos = cp->ap.carCos; car_cos = cp->ap.carCos;
SetRotMatrix(&cp->hd.drawCarMat); SetRotMatrix(&cp->hd.where);
steps = 4 / MAX_TYRE_TRACK_WHEELS; steps = 4 / MAX_TYRE_TRACK_WHEELS;
for (loop = 0; loop < 4; loop += steps) for (loop = 0; loop < 4; loop += steps)
{ {
WheelPos.vx = car_cos->wheelDisp[loop].vx;
if (loop & 2) if (loop & 2)
WheelPos.vx = car_cos->wheelDisp[loop].vx + 17; WheelPos.vx += 17;
else else
WheelPos.vx = car_cos->wheelDisp[loop].vx - 17; WheelPos.vx -= 17;
WheelPos.vy = 0; WheelPos.vy = 0;
WheelPos.vz = -car_cos->wheelDisp[loop + 1 & 3].vz; WheelPos.vz = car_cos->wheelDisp[loop + 1 & 3].vz;
_MatrixRotate(&WheelPos); _MatrixRotate(&WheelPos);