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

- fix annoying car storing bug (again!!!)

Browse Source
This commit is contained in:
Ilya Shurumov 2021-05-24 20:44:18 +06:00 committed by InspirationByte
parent 59751a9295
commit a5f7597637
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src_rebuild/Game/C/mgeneric.c
View File

@ -15,7 +15,8 @@ void StorePlayerPosition(SAVED_PLAYER_POS *data)
ushort type; ushort type;
int slot; int slot;
slot = player[0].playerCarId; // store previous player car?
slot = Mission.PhantomCarId != -1 ? Mission.PhantomCarId : player[0].playerCarId;
cp = &car_data[slot]; cp = &car_data[slot];
@ -25,10 +26,10 @@ void StorePlayerPosition(SAVED_PLAYER_POS *data)
type = 0; type = 0;
data->type = type; data->type = type;
data->direction = player[0].dir; data->direction = cp->hd.direction;
data->vx = player[0].pos[0]; data->vx = cp->hd.where.t[0];
data->vy = player[0].pos[1]; data->vy = cp->hd.where.t[1];
data->vz = player[0].pos[2]; data->vz = cp->hd.where.t[2];
if (slot < 0) if (slot < 0)
data->felony = pedestrianFelony; data->felony = pedestrianFelony;
@ -100,17 +101,13 @@ void StoreCarPosition(MS_TARGET *target, SAVED_CAR_POS *data)
int slot; int slot;
CAR_DATA* cp; CAR_DATA* cp;
// if target is a swapable, make sure it gonna be previous player car slot = target->s.car.slot;
if (target->s.car.flags & CARTARGET_FLAG_BACK_TO_PLAYERCAR)
slot = Mission.PhantomCarId;
else
slot = target->s.car.slot;
if (slot == -1) if (slot == -1)
return; return;
if (slot == player[0].playerCarId) //if (slot == player[0].playerCarId)
return; // return;
cp = &car_data[slot]; cp = &car_data[slot];
@ -229,7 +226,8 @@ void StoreEndData(void)
carpos = &MissionEndData.CarPos[numStored]; carpos = &MissionEndData.CarPos[numStored];
if (target->type == Target_Car && if (target->type == Target_Car &&
(target->s.target_flags & TARGET_FLAG_CAR_SAVED)) (target->s.target_flags & TARGET_FLAG_CAR_SAVED) &&
(target->s.target_flags & TARGET_FLAG_CAR_PINGED_IN))
{ {
StoreCarPosition(target, carpos); StoreCarPosition(target, carpos);

2
src_rebuild/Game/C/mission.c
View File

@ -3119,8 +3119,6 @@ void SetCarToBeStolen(MS_TARGET *target, int player)
SetPlayerMessage(player, Mission.StealMessage, 2, 2); SetPlayerMessage(player, Mission.StealMessage, 2, 2);
} }
// [D] [T] // [D] [T]
void HandleMission(void) void HandleMission(void)
{ {