diff options
| author | aap <aap@papnet.eu> | 2020-05-26 18:50:11 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-26 18:50:19 +0200 |
| commit | 7f60be9814894fc5c6e9fbc9d52be492c8c92a11 (patch) | |
| tree | f15b8d6bb195ad71ffd9e7051c26a5b42e2f71a7 | |
| parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
| download | re3-7f60be9814894fc5c6e9fbc9d52be492c8c92a11.tar re3-7f60be9814894fc5c6e9fbc9d52be492c8c92a11.tar.gz re3-7f60be9814894fc5c6e9fbc9d52be492c8c92a11.tar.bz2 re3-7f60be9814894fc5c6e9fbc9d52be492c8c92a11.tar.lz re3-7f60be9814894fc5c6e9fbc9d52be492c8c92a11.tar.xz re3-7f60be9814894fc5c6e9fbc9d52be492c8c92a11.tar.zst re3-7f60be9814894fc5c6e9fbc9d52be492c8c92a11.zip | |
| -rw-r--r-- | src/core/Camera.cpp | 2 | ||||
| -rw-r--r-- | src/render/Sprite.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index f618c652..b65b60f3 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -3193,7 +3193,7 @@ CCamera::GetLookDirection(void) Cams[ActiveCam].Mode == CCam::MODE_BEHINDBOAT || Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED) return Cams[ActiveCam].DirectionWasLooking; - return LOOKING_FORWARD;; + return LOOKING_FORWARD; } bool diff --git a/src/render/Sprite.cpp b/src/render/Sprite.cpp index 9631aced..a6d2db7b 100644 --- a/src/render/Sprite.cpp +++ b/src/render/Sprite.cpp @@ -22,8 +22,8 @@ CSprite::CalcHorizonCoors(void) bool CSprite::CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh, bool farclip) { - CVector viewvec = TheCamera.m_viewMatrix * *(CVector*)∈ - *out = *(RwV3d*)&viewvec; + CVector viewvec = TheCamera.m_viewMatrix * in; + *out = viewvec; if(out->z <= CDraw::GetNearClipZ() + 1.0f) return false; if(out->z >= CDraw::GetFarClipZ() && farclip) return false; float recip = 1.0f/out->z; |