summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-26 18:50:27 +0200
committeraap <aap@papnet.eu>2020-05-26 18:50:27 +0200
commit0ac3477035e0bf217eeb33f25a265faa391cf1af (patch)
treeb656ed5100390f67577f2726edbfbd38bbd2b7b9
parentupdated librw (diff)
downloadre3-0ac3477035e0bf217eeb33f25a265faa391cf1af.tar
re3-0ac3477035e0bf217eeb33f25a265faa391cf1af.tar.gz
re3-0ac3477035e0bf217eeb33f25a265faa391cf1af.tar.bz2
re3-0ac3477035e0bf217eeb33f25a265faa391cf1af.tar.lz
re3-0ac3477035e0bf217eeb33f25a265faa391cf1af.tar.xz
re3-0ac3477035e0bf217eeb33f25a265faa391cf1af.tar.zst
re3-0ac3477035e0bf217eeb33f25a265faa391cf1af.zip
-rw-r--r--src/core/Camera.cpp2
-rw-r--r--src/render/Sprite.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 35d230dc..53bee20f 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -3218,7 +3218,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 1dd1aaab..0789769a 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*)&in;
- *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;