diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2019-07-24 19:30:09 +0200 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2019-07-24 19:30:09 +0200 |
| commit | 0c0e564019af4dac66150b1bfa5c13219b9eb752 (patch) | |
| tree | 6cb58eae0085a0a5a4abf5535e1d452ed497dd21 /src/core | |
| parent | shadows done (diff) | |
| download | re3-0c0e564019af4dac66150b1bfa5c13219b9eb752.tar re3-0c0e564019af4dac66150b1bfa5c13219b9eb752.tar.gz re3-0c0e564019af4dac66150b1bfa5c13219b9eb752.tar.bz2 re3-0c0e564019af4dac66150b1bfa5c13219b9eb752.tar.lz re3-0c0e564019af4dac66150b1bfa5c13219b9eb752.tar.xz re3-0c0e564019af4dac66150b1bfa5c13219b9eb752.tar.zst re3-0c0e564019af4dac66150b1bfa5c13219b9eb752.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Camera.h | 2 | ||||
| -rw-r--r-- | src/core/main.cpp | 2 | ||||
| -rw-r--r-- | src/core/re3.cpp | 17 |
3 files changed, 3 insertions, 18 deletions
diff --git a/src/core/Camera.h b/src/core/Camera.h index 10554601..84af9d55 100644 --- a/src/core/Camera.h +++ b/src/core/Camera.h @@ -441,7 +441,7 @@ int m_iModeObbeCamIsInForCar; static bool &m_bUseMouse3rdPerson; - CMatrix &GetCameraMatrix(void) { return m_cameraMatrix; } + inline const CMatrix GetCameraMatrix(void) { return m_cameraMatrix; } CVector &GetGameCamPosition(void) { return m_vecGameCamPos; } bool IsPointVisible(const CVector ¢er, const CMatrix *mat); bool IsSphereVisible(const CVector ¢er, float radius, const CMatrix *mat); diff --git a/src/core/main.cpp b/src/core/main.cpp index 7fcc7ec9..e301b470 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -501,7 +501,7 @@ void DisplayGameDebugText() { static bool bDisplayPosn = false; - static bool bDisplayRate = false; + static bool bDisplayRate = false; { SETTWEAKPATH("GameDebugText"); diff --git a/src/core/re3.cpp b/src/core/re3.cpp index bea5763c..e3aece97 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -190,21 +190,6 @@ void CTweakVars::AddDBG(const char *path) bAddTweakVarsNow = true; } -//inline DebugMenuEntry * DebugMenuAddVar (const char *path , name, ptr, trig, step, lowerBound, upperBound, const char **strings) -/* -inline DebugMenuEntry * -DebugMenuAddVar - -(const char *path, -const char *name, -int8_t *ptr, -TriggerFunc triggerFunc, -int8_t step, -int8_t lowerBound, -int8_t upperBound, -const char **strings) -*/ - void CTweakSwitch::AddDBG(const char *path) { DebugMenuEntry *e = DebugMenuAddVar(m_pPath == NULL ? path : m_pPath, m_pVarName, (int32_t *)m_pIntVar, m_pFunc, 1, m_nMin, m_nMax, m_aStr); @@ -232,7 +217,7 @@ TWEAKSWITCH(CWeather::NewWeatherType, 0, 3, wt, NULL); void DebugMenuPopulate(void) -{ +{ if(DebugMenuLoad()){ static const char *weathers[] = { "Sunny", "Cloudy", "Rainy", "Foggy" |