diff options
| author | aap <aap@papnet.eu> | 2020-06-29 12:12:43 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-06-29 12:12:43 +0200 |
| commit | 94ce376a767221eac19d8c9cf6d86f387aca1088 (patch) | |
| tree | 6790a27ecc72d59fe2b2e3a18de86ee32559ea9c /src/core | |
| parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
| download | re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.gz re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.bz2 re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.lz re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.xz re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.zst re3-94ce376a767221eac19d8c9cf6d86f387aca1088.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Camera.h | 6 | ||||
| -rw-r--r-- | src/core/config.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/core/Camera.h b/src/core/Camera.h index f9a138b9..ff74931c 100644 --- a/src/core/Camera.h +++ b/src/core/Camera.h @@ -413,12 +413,9 @@ public: float CarZoomValueSmooth; float DistanceToWater; -#ifndef PS2_CAM_TRANSITION float FOVDuringInter; -#endif float LODDistMultiplier; float GenerationDistMultiplier; -#ifndef PS2_CAM_TRANSITION float m_fAlphaSpeedAtStartInter; float m_fAlphaWhenInterPol; float m_fAlphaDuringInterPol; @@ -429,7 +426,6 @@ public: float m_fFOVSpeedAtStartInter; float m_fStartingBetaForInterPol; float m_fStartingAlphaForInterPol; -#endif float m_PedOrientForBehindOrInFront; float m_CameraAverageSpeed; float m_CameraSpeedSoFar; @@ -492,11 +488,9 @@ public: CVector m_vecUpWhenInterPol; CVector m_vecClearGeometryVec; CVector m_vecGameCamPos; -#ifndef PS2_CAM_TRANSITION CVector SourceDuringInter; CVector TargetDuringInter; CVector UpDuringInter; -#endif RwCamera *m_pRwCamera; CEntity *pTargetEntity; CCamPathSplines m_arrPathArray[MAX_NUM_OF_SPLINETYPES]; diff --git a/src/core/config.h b/src/core/config.h index 9bac9cdb..7ba1a6fd 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -284,6 +284,5 @@ enum Config { #define CANCELLABLE_CAR_ENTER // Camera -//#define PS2_CAM_TRANSITION // old way of transitioning between cam modes #define IMPROVED_CAMERA // Better Debug cam, and maybe more in the future #define FREE_CAM // Rotating cam |