summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-20 12:35:24 +0200
committerGitHub <noreply@github.com>2019-07-20 12:35:24 +0200
commit29d7b983d7db02363a1ce310100d98d8910798d9 (patch)
tree56ab95801891111dc1434662e47da3cd41865eca /src/core
parentMerge pull request #151 from Nick007J/master (diff)
parentfixes for #142 (diff)
downloadre3-29d7b983d7db02363a1ce310100d98d8910798d9.tar
re3-29d7b983d7db02363a1ce310100d98d8910798d9.tar.gz
re3-29d7b983d7db02363a1ce310100d98d8910798d9.tar.bz2
re3-29d7b983d7db02363a1ce310100d98d8910798d9.tar.lz
re3-29d7b983d7db02363a1ce310100d98d8910798d9.tar.xz
re3-29d7b983d7db02363a1ce310100d98d8910798d9.tar.zst
re3-29d7b983d7db02363a1ce310100d98d8910798d9.zip
Diffstat (limited to '')
-rw-r--r--src/core/Camera.h1
-rw-r--r--src/core/FileLoader.cpp2
-rw-r--r--src/core/common.h10
3 files changed, 7 insertions, 6 deletions
diff --git a/src/core/Camera.h b/src/core/Camera.h
index b5c9103c..d890db84 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -441,6 +441,7 @@ int m_iModeObbeCamIsInForCar;
static bool &m_bUseMouse3rdPerson;
+ bool Get_Just_Switched_Status() { return m_bJust_Switched; }
CMatrix &GetCameraMatrix(void) { return m_cameraMatrix; }
CVector &GetGameCamPosition(void) { return m_vecGameCamPos; }
bool IsPointVisible(const CVector &center, const CMatrix *mat);
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 0c53ae66..450cc146 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -1,7 +1,7 @@
#include "common.h"
#include "main.h"
#include "patcher.h"
-#include "math/Quaternion.h"
+#include "Quaternion.h"
#include "ModelInfo.h"
#include "ModelIndices.h"
#include "TempColModels.h"
diff --git a/src/core/common.h b/src/core/common.h
index c241e1c6..2ca64c1b 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -97,11 +97,11 @@ extern void **rwengine;
#define SCREEN_SCALE_AR(a) (a)
#endif
-#include "math/maths.h"
-#include "math/Vector.h"
-#include "math/Vector2D.h"
-#include "math/Matrix.h"
-#include "math/Rect.h"
+#include "maths.h"
+#include "Vector.h"
+#include "Vector2D.h"
+#include "Matrix.h"
+#include "Rect.h"
class CRGBA
{