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

- final fix for car save/restore

Browse Source
This commit is contained in:
Ilya Shurumov 2020-12-23 15:25:36 +06:00
parent f46571fba8
commit b092358afd
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src_rebuild/GAME/C/MAIN.C
View File

@ -660,13 +660,14 @@ void GameInit(void)
padid = -i;
if (i < NumPlayers)
{
gStartOnFoot = (plStart->type == 2);
padid = i;
gStartOnFoot = (plStart->type == 2);
}
InitPlayer(&player[i], &car_data[i], plStart->controlType, plStart->rotation, (LONGVECTOR4 *)&plStart->position, plStart->model, plStart->palette, &padid);
if (gStartOnFoot == 0)
if (!(plStart->type == 2))
{
car_data[i].ap.damage[0] = plStart->damage[0];
car_data[i].ap.damage[1] = plStart->damage[1];

17
src_rebuild/GAME/C/MGENERIC.C
View File

@ -8,6 +8,7 @@
#include "REPLAYS.H"
#include "STRINGS.H"
#include "SYSTEM.H"
// [D] [T]
@ -73,9 +74,9 @@ void RestorePlayerPosition(SAVED_PLAYER_POS *data)
if (gCurrentMissionNumber != 16)
{
PlayerStartInfo[0]->position.vx = data->vx;
PlayerStartInfo[0]->position.vx = data->vy;
PlayerStartInfo[0]->position.vy = data->vy;
PlayerStartInfo[0]->position.vz = data->vz;
PlayerStartInfo[0]->rotation = data->direction;
PlayerStartInfo[0]->rotation = data->direction & 0xfff;
}
PlayerStartInfo[0]->totaldamage = data->totaldamage;
@ -147,7 +148,7 @@ void RestoreCarPosition(SAVED_CAR_POS *data)
if (data->active & 0x80)
{
memcpy(&ReplayStreams[numPlayersToCreate].SourceType, PlayerStartInfo[0], sizeof(STREAM_SOURCE));
memcpy(PlayerStartInfo[numPlayersToCreate], PlayerStartInfo[0], sizeof(STREAM_SOURCE));
PlayerStartInfo[numPlayersToCreate]->type = 3;
@ -157,7 +158,7 @@ void RestoreCarPosition(SAVED_CAR_POS *data)
PlayerStartInfo[0]->position.vx = data->vx;
PlayerStartInfo[0]->position.vy = data->vy;
PlayerStartInfo[0]->position.vz = data->vz;
PlayerStartInfo[0]->rotation = data->direction;
PlayerStartInfo[0]->rotation = data->direction & 0xfff;
PlayerStartInfo[0]->totaldamage = data->totaldamage;
PlayerStartInfo[0]->damage[0] = data->damage[0];
PlayerStartInfo[0]->damage[1] = data->damage[1];
@ -174,7 +175,7 @@ void RestoreCarPosition(SAVED_CAR_POS *data)
ReplayStreams[numPlayersToCreate].SourceType.position.vy = data->vy;
ReplayStreams[numPlayersToCreate].SourceType.position.vx = data->vx;
ReplayStreams[numPlayersToCreate].SourceType.position.vz = data->vz;
ReplayStreams[numPlayersToCreate].SourceType.rotation = data->direction;
ReplayStreams[numPlayersToCreate].SourceType.rotation = data->direction & 0xfff;
ReplayStreams[numPlayersToCreate].SourceType.totaldamage = data->totaldamage;
ReplayStreams[numPlayersToCreate].SourceType.damage[0] = data->damage[0];
ReplayStreams[numPlayersToCreate].SourceType.damage[1] = data->damage[1];
@ -194,19 +195,21 @@ void StoreEndData(void)
int i;
SAVED_CAR_POS* carpos;
ClearMem((char*)&MissionEndData, sizeof(MissionEndData));
if (gCurrentMissionNumber > 40)
return;
numStored = 0;
StorePlayerPosition(&MissionEndData.PlayerPos);
for(i = 0; i < 16; i++)
for(i = 0; i < 16 && numStored < 6; i++)
{
target = &MissionTargets[i];
carpos = &MissionEndData.CarPos[numStored];
if (target->type == Target_Car &&
(target->target_flags & 0x12))
(target->target_flags & 0x10))
{
StoreCarPosition(target, carpos);
numStored++;

9
src_rebuild/GAME/C/MISSION.C
View File

@ -330,6 +330,7 @@ void SetupResidentModels()
// check if start data is required
if (MissionHeader->type & 1)
{
// check if start data is required
RestoreStartData();
if (PlayerStartInfo[0]->model > 4)
@ -704,12 +705,6 @@ void LoadMission(int missionnum)
LoadfileSeg(filename, (char*)(MissionTargets + 4), 0, 640);
}
// check if start data is required
if (MissionHeader->type & 1)
{
RestoreStartData();
}
PreProcessTargets();
// assign story mission title
@ -3135,13 +3130,13 @@ void MakePhantomCarEqualPlayerCar(void)
Mission.PhantomCarId = player[0].playerCarId;
}
// [D]
void SetCarToBeStolen(MS_TARGET *target, int player)
{
if (target->car.flags & 0x800000)
MakePhantomCarEqualPlayerCar();
target->target_flags |= 0x10;
target->car.type = 1;
target->car.flags = 0x30;
target->car.maxDistance = 0;