diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-12-18 01:58:09 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-12-18 01:58:09 +0100 |
| commit | cfda5eb148abdb502b049083c83f166460ccc8be (patch) | |
| tree | 290b84a8053f37f3b676fd26314631a528f04630 /src/control | |
| parent | Fix placement of some script functions (diff) | |
| download | re3-cfda5eb148abdb502b049083c83f166460ccc8be.tar re3-cfda5eb148abdb502b049083c83f166460ccc8be.tar.gz re3-cfda5eb148abdb502b049083c83f166460ccc8be.tar.bz2 re3-cfda5eb148abdb502b049083c83f166460ccc8be.tar.lz re3-cfda5eb148abdb502b049083c83f166460ccc8be.tar.xz re3-cfda5eb148abdb502b049083c83f166460ccc8be.tar.zst re3-cfda5eb148abdb502b049083c83f166460ccc8be.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Replay.cpp | 24 | ||||
| -rw-r--r-- | src/control/Script6.cpp | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index 0c70d2f6..6f53c0ad 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -1218,10 +1218,10 @@ void CReplay::ProcessReplayCamera(void) TheCamera.GetUp() = CVector(0.0f, 1.0f, 0.0f); TheCamera.GetRight() = CVector(1.0f, 0.0f, 0.0f); RwMatrix* pm = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)); - pm->pos = *(RwV3d*)&TheCamera.GetPosition(); - pm->at = *(RwV3d*)&TheCamera.GetForward(); - pm->up = *(RwV3d*)&TheCamera.GetUp(); - pm->right = *(RwV3d*)&TheCamera.GetRight(); + pm->pos = TheCamera.GetPosition(); + pm->at = TheCamera.GetForward(); + pm->up = TheCamera.GetUp(); + pm->right = TheCamera.GetRight(); break; } case REPLAYCAMMODE_FIXED: @@ -1237,10 +1237,10 @@ void CReplay::ProcessReplayCamera(void) TheCamera.GetMatrix().GetUp() = up; TheCamera.GetMatrix().GetRight() = right; RwMatrix* pm = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)); - pm->pos = *(RwV3d*)&TheCamera.GetMatrix().GetPosition(); - pm->at = *(RwV3d*)&TheCamera.GetMatrix().GetForward(); - pm->up = *(RwV3d*)&TheCamera.GetMatrix().GetUp(); - pm->right = *(RwV3d*)&TheCamera.GetMatrix().GetRight(); + pm->pos = TheCamera.GetMatrix().GetPosition(); + pm->at = TheCamera.GetMatrix().GetForward(); + pm->up = TheCamera.GetMatrix().GetUp(); + pm->right = TheCamera.GetMatrix().GetRight(); break; } default: @@ -1840,10 +1840,10 @@ void CReplay::ProcessLookAroundCam(void) TheCamera.GetRight() = right; TheCamera.SetPosition(camera_pt); RwMatrix* pm = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)); - pm->pos = *(RwV3d*)&TheCamera.GetPosition(); - pm->at = *(RwV3d*)&TheCamera.GetForward(); - pm->up = *(RwV3d*)&TheCamera.GetUp(); - pm->right = *(RwV3d*)&TheCamera.GetRight(); + pm->pos = TheCamera.GetPosition(); + pm->at = TheCamera.GetForward(); + pm->up = TheCamera.GetUp(); + pm->right = TheCamera.GetRight(); TheCamera.CalculateDerivedValues(); RwMatrixUpdate(RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera))); RwFrameUpdateObjects(RwCameraGetFrame(TheCamera.m_pRwCamera)); diff --git a/src/control/Script6.cpp b/src/control/Script6.cpp index 50a7f745..272ecd4b 100644 --- a/src/control/Script6.cpp +++ b/src/control/Script6.cpp @@ -999,7 +999,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) CVector vTestedPos(pTestedPed->GetPosition().x, pTestedPed->GetPosition().y, pTestedPed->GetPosition().z + 0.4); CVector vScreenPos; float w, h; - if (CSprite::CalcScreenCoors(vTestedPos, vScreenPos, &w, &h, false)) { + if (CSprite::CalcScreenCoors(vTestedPos, &vScreenPos, &w, &h, false)) { CVector2D vCrosshairPosition(CCamera::m_f3rdPersonCHairMultX * RsGlobal.maximumWidth, CCamera::m_f3rdPersonCHairMultY * RsGlobal.maximumHeight); float fScreenDistance = ((CVector2D)vScreenPos - vCrosshairPosition).Magnitude(); if (SCREEN_STRETCH_X(0.45f) > fScreenDistance / w) { |