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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Nikolay Korolev 2020-05-27 00:25:33 +03:00
parent ec1d14971c 4f1ce8bd42
commit 9673ecddad
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Camera.cpp
View file

@ -3218,7 +3218,7 @@ CCamera::GetLookDirection(void)
Cams[ActiveCam].Mode == CCam::MODE_BEHINDBOAT || Cams[ActiveCam].Mode == CCam::MODE_BEHINDBOAT ||
Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED) Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED)
return Cams[ActiveCam].DirectionWasLooking; return Cams[ActiveCam].DirectionWasLooking;
return LOOKING_FORWARD;; return LOOKING_FORWARD;
} }
bool bool

4
src/render/Sprite.cpp
View file

@ -22,8 +22,8 @@ CSprite::CalcHorizonCoors(void)
bool bool
CSprite::CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh, bool farclip) CSprite::CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh, bool farclip)
{ {
CVector viewvec = TheCamera.m_viewMatrix * *(CVector*)∈ CVector viewvec = TheCamera.m_viewMatrix * in;
*out = *(RwV3d*)&viewvec; *out = viewvec;
if(out->z <= CDraw::GetNearClipZ() + 1.0f) return false; if(out->z <= CDraw::GetNearClipZ() + 1.0f) return false;
if(out->z >= CDraw::GetFarClipZ() && farclip) return false; if(out->z >= CDraw::GetFarClipZ() && farclip) return false;
float recip = 1.0f/out->z; float recip = 1.0f/out->z;

9
src/vehicles/Automobile.h
View file

@ -36,7 +36,14 @@ enum eCarPositions
CAR_POS_TAILLIGHTS, CAR_POS_TAILLIGHTS,
CAR_POS_FRONTSEAT, CAR_POS_FRONTSEAT,
CAR_POS_BACKSEAT, 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 // These are used for all the wheel arrays