a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 16:00:02 +00:00
Code Issues Projects Releases Wiki Activity

fixed replay

Browse source
This commit is contained in:
Nikolay Korolev 2019-07-20 16:18:56 +03:00
parent 52718385db
commit 60e5b8a8a9
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/control/Replay.cpp
View file

@ -625,9 +625,9 @@ void CReplay::StoreCarUpdate(CVehicle *vehicle, int id)
vp->health = vehicle->m_fHealth / 4.0f; /* Not anticipated that health can be > 1000. */ vp->health = vehicle->m_fHealth / 4.0f; /* Not anticipated that health can be > 1000. */
vp->acceleration = vehicle->m_fGasPedal * 100.0f; vp->acceleration = vehicle->m_fGasPedal * 100.0f;
vp->panels = vehicle->IsCar() ? ((CAutomobile*)vehicle)->Damage.m_panelStatus : 0; vp->panels = vehicle->IsCar() ? ((CAutomobile*)vehicle)->Damage.m_panelStatus : 0;
vp->velocityX = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetSpeed().x)); /* 8000!? */ vp->velocityX = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetMoveSpeed().x)); /* 8000!? */
vp->velocityY = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetSpeed().y)); vp->velocityY = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetMoveSpeed().y));
vp->velocityZ = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetSpeed().z)); vp->velocityZ = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetMoveSpeed().z));
vp->mi = vehicle->GetModelIndex(); vp->mi = vehicle->GetModelIndex();
vp->primary_color = vehicle->m_currentColour1; vp->primary_color = vehicle->m_currentColour1;
vp->secondary_color = vehicle->m_currentColour2; vp->secondary_color = vehicle->m_currentColour2;
@ -850,10 +850,10 @@ bool CReplay::PlayBackThisFrameInterpolation(CAddressInReplayBuffer *buffer, flo
TheCamera.GetMatrix().GetPosition() *= split; TheCamera.GetMatrix().GetPosition() *= split;
TheCamera.GetMatrix() += CMatrix(interpolation) * pg->camera_pos; TheCamera.GetMatrix() += CMatrix(interpolation) * pg->camera_pos;
RwMatrix* pm = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)); RwMatrix* pm = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera));
pm->pos = *(RwV3d*)TheCamera.GetMatrix().GetPosition(); pm->pos = *(RwV3d*)TheCamera.GetPosition();
pm->at = *(RwV3d*)TheCamera.GetMatrix().GetForward(); pm->at = *(RwV3d*)TheCamera.GetForward();
pm->up = *(RwV3d*)TheCamera.GetMatrix().GetUp(); pm->up = *(RwV3d*)TheCamera.GetUp();
pm->right = *(RwV3d*)TheCamera.GetMatrix().GetRight(); pm->right = *(RwV3d*)TheCamera.GetRight();
CameraFocusX = split * CameraFocusX + interpolation * pg->player_pos.x; CameraFocusX = split * CameraFocusX + interpolation * pg->player_pos.x;
CameraFocusY = split * CameraFocusY + interpolation * pg->player_pos.y; CameraFocusY = split * CameraFocusY + interpolation * pg->player_pos.y;
CameraFocusZ = split * CameraFocusZ + interpolation * pg->player_pos.z; CameraFocusZ = split * CameraFocusZ + interpolation * pg->player_pos.z;
@ -979,15 +979,15 @@ void CReplay::ProcessReplayCamera(void)
switch (CameraMode) { switch (CameraMode) {
case REPLAYCAMMODE_TOPDOWN: case REPLAYCAMMODE_TOPDOWN:
{ {
TheCamera.GetMatrix().GetPosition() = CVector(CameraFocusX, CameraFocusY, CameraFocusZ + 15.0f); TheCamera.GetPosition() = CVector(CameraFocusX, CameraFocusY, CameraFocusZ + 15.0f);
TheCamera.GetMatrix().GetForward() = CVector(0.0f, 0.0f, -1.0f); TheCamera.GetForward() = CVector(0.0f, 0.0f, -1.0f);
TheCamera.GetMatrix().GetUp() = CVector(0.0f, 1.0f, 0.0f); TheCamera.GetUp() = CVector(0.0f, 1.0f, 0.0f);
TheCamera.GetMatrix().GetRight() = CVector(1.0f, 0.0f, 0.0f); TheCamera.GetRight() = CVector(1.0f, 0.0f, 0.0f);
RwMatrix* pm = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)); RwMatrix* pm = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera));
pm->pos = *(RwV3d*)&TheCamera.GetMatrix().GetPosition(); pm->pos = *(RwV3d*)&TheCamera.GetPosition();
pm->at = *(RwV3d*)&TheCamera.GetMatrix().GetForward(); pm->at = *(RwV3d*)&TheCamera.GetForward();
pm->up = *(RwV3d*)&TheCamera.GetMatrix().GetUp(); pm->up = *(RwV3d*)&TheCamera.GetUp();
pm->right = *(RwV3d*)&TheCamera.GetMatrix().GetRight(); pm->right = *(RwV3d*)&TheCamera.GetRight();
break; break;
} }
case REPLAYCAMMODE_FIXED: case REPLAYCAMMODE_FIXED:
@ -1113,7 +1113,7 @@ void CReplay::StoreStuffInMem(void)
TimeStep = CTimer::GetTimeStep(); TimeStep = CTimer::GetTimeStep();
TimeScale = CTimer::GetTimeScale(); TimeScale = CTimer::GetTimeScale();
int size = CPools::GetPedPool()->GetSize(); int size = CPools::GetPedPool()->GetSize();
pPedAnims = (CStoredDetailedAnimationState*)malloc(size * sizeof(CStoredDetailedAnimationState)); pPedAnims = new CStoredDetailedAnimationState[size];
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
CPed* ped = CPools::GetPedPool()->GetSlot(i); CPed* ped = CPools::GetPedPool()->GetSlot(i);
if (ped) if (ped)
@ -1279,7 +1279,7 @@ void CReplay::RestoreStuffFromMem(void)
continue; continue;
RetrieveDetailedPedAnimation(ped, &pPedAnims[i]); RetrieveDetailedPedAnimation(ped, &pPedAnims[i]);
} }
free(pPedAnims); delete[] pPedAnims;
pPedAnims = nil; pPedAnims = nil;
DMAudio.ChangeMusicMode(0); DMAudio.ChangeMusicMode(0);
DMAudio.SetRadioInCar(OldRadioStation); DMAudio.SetRadioInCar(OldRadioStation);
@ -1525,15 +1525,15 @@ void CReplay::ProcessLookAroundCam(void)
right.Normalise(); right.Normalise();
CVector up = CrossProduct(forward, right); CVector up = CrossProduct(forward, right);
up.Normalise(); up.Normalise();
TheCamera.GetMatrix().GetForward() = forward; TheCamera.GetForward() = forward;
TheCamera.GetMatrix().GetUp() = up; TheCamera.GetUp() = up;
TheCamera.GetMatrix().GetRight() = right; TheCamera.GetRight() = right;
TheCamera.GetMatrix().GetPosition() = camera_pt; TheCamera.GetPosition() = camera_pt;
RwMatrix* pm = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)); RwMatrix* pm = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera));
pm->pos = *(RwV3d*)&TheCamera.GetMatrix().GetPosition(); pm->pos = *(RwV3d*)&TheCamera.GetPosition();
pm->at = *(RwV3d*)&TheCamera.GetMatrix().GetForward(); pm->at = *(RwV3d*)&TheCamera.GetForward();
pm->up = *(RwV3d*)&TheCamera.GetMatrix().GetUp(); pm->up = *(RwV3d*)&TheCamera.GetUp();
pm->right = *(RwV3d*)&TheCamera.GetMatrix().GetRight(); pm->right = *(RwV3d*)&TheCamera.GetRight();
TheCamera.CalculateDerivedValues(); TheCamera.CalculateDerivedValues();
RwMatrixUpdate(RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera))); RwMatrixUpdate(RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)));
RwFrameUpdateObjects(RwCameraGetFrame(TheCamera.m_pRwCamera)); RwFrameUpdateObjects(RwCameraGetFrame(TheCamera.m_pRwCamera));

2
src/control/Replay.h
View file

@ -176,7 +176,7 @@ class CReplay
int8 velocityZ; int8 velocityZ;
union{ union{
int8 car_gun; int8 car_gun;
uint8 wheel_state; int8 wheel_state;
}; };
uint8 wheel_susp_dist[4]; uint8 wheel_susp_dist[4];
uint8 wheel_rotation[4]; uint8 wheel_rotation[4];