diff options
| author | aap <aap@papnet.eu> | 2020-06-21 14:50:31 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-06-21 14:52:03 +0200 |
| commit | e563450cb6df6d7aa20a53a0614ebf583003ce6e (patch) | |
| tree | c7c111f0e7b71ee3cbe9b3abd85bee8388e15f45 /src/core | |
| parent | Merge pull request #636 from aap/miami (diff) | |
| download | re3-e563450cb6df6d7aa20a53a0614ebf583003ce6e.tar re3-e563450cb6df6d7aa20a53a0614ebf583003ce6e.tar.gz re3-e563450cb6df6d7aa20a53a0614ebf583003ce6e.tar.bz2 re3-e563450cb6df6d7aa20a53a0614ebf583003ce6e.tar.lz re3-e563450cb6df6d7aa20a53a0614ebf583003ce6e.tar.xz re3-e563450cb6df6d7aa20a53a0614ebf583003ce6e.tar.zst re3-e563450cb6df6d7aa20a53a0614ebf583003ce6e.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Camera.cpp | 8 | ||||
| -rw-r--r-- | src/core/Pad.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index b1592d93..45659f72 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -2292,6 +2292,10 @@ CCamera::StartTransition(int16 newMode) Cams[ActiveCam].BetaSpeed = 0.0f; break; + case CCam::MODE_BEHINDBOAT: + Cams[ActiveCam].BetaSpeed = 0.0f; + break; + case CCam::MODE_FOLLOWPED: // Getting out of vehicle normally betaOffset = DEGTORAD(55.0f); @@ -2386,10 +2390,6 @@ CCamera::StartTransition(int16 newMode) Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y); break; - case CCam::MODE_BEHINDBOAT: - Cams[ActiveCam].BetaSpeed = 0.0f; - break; - case CCam::MODE_PED_DEAD_BABY: Cams[ActiveCam].Alpha = DEGTORAD(15.0f); break; diff --git a/src/core/Pad.h b/src/core/Pad.h index a1461575..ccfdcbc9 100644 --- a/src/core/Pad.h +++ b/src/core/Pad.h @@ -444,6 +444,7 @@ public: bool GetLeftShoulder2(void) { return !!NewState.LeftShoulder2; } bool GetRightShoulder1(void) { return !!NewState.RightShoulder1; } bool GetRightShoulder2(void) { return !!NewState.RightShoulder2; } + bool GetStart() { return !!NewState.Start; } int16 GetLeftStickX(void) { return NewState.LeftStickX; } int16 GetLeftStickY(void) { return NewState.LeftStickY; } int16 GetRightStickX(void) { return NewState.RightStickX; } |