summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-26 23:25:33 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-26 23:25:33 +0200
commit9673ecddadcad90f368bd0fe8e897db24d187346 (patch)
tree32e9e4c8ea28fd4d61e4c5204cd086bd652deca4
parentmission replay (diff)
parentadded some unused enums (diff)
downloadre3-9673ecddadcad90f368bd0fe8e897db24d187346.tar
re3-9673ecddadcad90f368bd0fe8e897db24d187346.tar.gz
re3-9673ecddadcad90f368bd0fe8e897db24d187346.tar.bz2
re3-9673ecddadcad90f368bd0fe8e897db24d187346.tar.lz
re3-9673ecddadcad90f368bd0fe8e897db24d187346.tar.xz
re3-9673ecddadcad90f368bd0fe8e897db24d187346.tar.zst
re3-9673ecddadcad90f368bd0fe8e897db24d187346.zip
Diffstat (limited to '')
-rw-r--r--src/core/Camera.cpp2
-rw-r--r--src/render/Sprite.cpp4
-rw-r--r--src/vehicles/Automobile.h9
3 files changed, 11 insertions, 4 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;
diff --git a/src/vehicles/Automobile.h b/src/vehicles/Automobile.h
index a2ff2616..0c02379f 100644
--- a/src/vehicles/Automobile.h
+++ b/src/vehicles/Automobile.h
@@ -36,7 +36,14 @@ enum eCarPositions
CAR_POS_TAILLIGHTS,
CAR_POS_FRONTSEAT,
CAR_POS_BACKSEAT,
- CAR_POS_EXHAUST = 9,
+ // these are unused so we don't know the actual values
+ CAR_POS_REVERSELIGHTS,
+ CAR_POS_BRAKELIGHTS,
+ CAR_POS_INDICATORS_FRONT,
+ CAR_POS_INDICATORS_BACK,
+ CAR_POS_STEERWHEEL,
+ //
+ CAR_POS_EXHAUST
};
// These are used for all the wheel arrays