summaryrefslogtreecommitdiffstats
path: root/src/core/Camera.h
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-06-20 15:23:42 +0200
committereray orçunus <erayorcunus@gmail.com>2020-06-20 15:23:42 +0200
commitfd3cd2c26ac24fc104878cf80f59518ae51d2e8d (patch)
tree90809f252c4cbb485f5df5f23c76f9f380d9a8d2 /src/core/Camera.h
parentDucking, shooting vehicle occupants and weapon fixes (diff)
parentMerge pull request #636 from aap/miami (diff)
downloadre3-fd3cd2c26ac24fc104878cf80f59518ae51d2e8d.tar
re3-fd3cd2c26ac24fc104878cf80f59518ae51d2e8d.tar.gz
re3-fd3cd2c26ac24fc104878cf80f59518ae51d2e8d.tar.bz2
re3-fd3cd2c26ac24fc104878cf80f59518ae51d2e8d.tar.lz
re3-fd3cd2c26ac24fc104878cf80f59518ae51d2e8d.tar.xz
re3-fd3cd2c26ac24fc104878cf80f59518ae51d2e8d.tar.zst
re3-fd3cd2c26ac24fc104878cf80f59518ae51d2e8d.zip
Diffstat (limited to 'src/core/Camera.h')
-rw-r--r--src/core/Camera.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/Camera.h b/src/core/Camera.h
index 2066ebf1..e0c11981 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -249,7 +249,8 @@ class CCamPathSplines
{
public:
enum {MAXPATHLENGTH=800};
- float m_arr_PathData[MAXPATHLENGTH];
+// float m_arr_PathData[MAXPATHLENGTH];
+ float *m_arr_PathData;
CCamPathSplines(void);
};
@@ -551,6 +552,7 @@ public:
bool Get_Just_Switched_Status() { return m_bJust_Switched; }
void AvoidTheGeometry(const CVector &Source, const CVector &TargetPos, CVector &NewSource, float FOV);
void GetArrPosForVehicleType(int apperance, int &index);
+ void GetScreenRect(CRect &rect);
// Who's in control
void TakeControl(CEntity *target, int16 mode, int16 typeOfSwitch, int32 controller);
@@ -576,6 +578,7 @@ public:
bool TryToStartNewCamMode(int32 obbeMode);
void DontProcessObbeCinemaCamera(void);
void ProcessObbeCinemaCameraCar(void);
+ void ProcessObbeCinemaCameraHeli(void);
void ProcessObbeCinemaCameraPed(void);
// Train
@@ -584,6 +587,7 @@ public:
// Script
void LoadPathSplines(int file);
+ void DeleteCutSceneCamDataMemory(void);
void FinishCutscene(void);
float GetPositionAlongSpline(void) { return m_fPositionAlongSpline; }
uint32 GetCutSceneFinishTime(void);
@@ -617,7 +621,7 @@ public:
void SetNewPlayerWeaponMode(int16 mode, int16 minZoom, int16 maxZoom);
void ClearPlayerWeaponMode(void);
void UpdateAimingCoors(CVector const &coors);
- void Find3rdPersonCamTargetVector(float dist, CVector pos, CVector &source, CVector &target);
+ bool Find3rdPersonCamTargetVector(float dist, CVector pos, CVector &source, CVector &target);
float Find3rdPersonQuickAimPitch(void);
bool Using1stPersonWeaponMode(void);