diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-02-08 11:21:53 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-02-08 11:21:53 +0100 |
| commit | 0eb191371388e5b25fbc957ca928c457fc544b21 (patch) | |
| tree | b3203e68d3f74c005d2fe0689bce7cf3240dd713 /src/core | |
| parent | Don't show menu map and new languages if gamefiles isn't copied (diff) | |
| parent | reorganize shaders; use modulate flag; update librw (diff) | |
| download | re3-0eb191371388e5b25fbc957ca928c457fc544b21.tar re3-0eb191371388e5b25fbc957ca928c457fc544b21.tar.gz re3-0eb191371388e5b25fbc957ca928c457fc544b21.tar.bz2 re3-0eb191371388e5b25fbc957ca928c457fc544b21.tar.lz re3-0eb191371388e5b25fbc957ca928c457fc544b21.tar.xz re3-0eb191371388e5b25fbc957ca928c457fc544b21.tar.zst re3-0eb191371388e5b25fbc957ca928c457fc544b21.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Cam.cpp | 2 | ||||
| -rw-r--r-- | src/core/Game.cpp | 9 | ||||
| -rw-r--r-- | src/core/common.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index 2a32ed1f..e0497fe2 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -4631,7 +4631,7 @@ CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrient */ { LookLeftRight = -CPad::GetPad(0)->LookAroundLeftRight(); - LookUpDown = -CPad::GetPad(0)->LookAroundUpDown(); + LookUpDown = CPad::GetPad(0)->LookAroundUpDown(); } float AlphaOffset, BetaOffset; if(UseMouse){ diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 4fd30b53..2a6afa97 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -414,6 +414,11 @@ bool CGame::Initialise(const char* datFile) CTxdStore::Create(gameTxdSlot); CTxdStore::AddRef(gameTxdSlot); +#ifdef EXTENDED_PIPELINES + // for generic fallback + CustomPipes::SetTxdFindCallback(); +#endif + LoadingScreen("Loading the Game", "Loading particles", nil); int particleTxdSlot = CTxdStore::AddTxdSlot("particle"); CTxdStore::LoadTxd(particleTxdSlot, "MODELS/PARTICLE.TXD"); @@ -498,10 +503,6 @@ bool CGame::Initialise(const char* datFile) CFileLoader::LoadLevel("GTA3.DAT"); #endif -#ifdef EXTENDED_PIPELINES - // for generic fallback - CustomPipes::SetTxdFindCallback(); -#endif CWorld::AddParticles(); CVehicleModelInfo::LoadVehicleColours(); CVehicleModelInfo::LoadEnvironmentMaps(); diff --git a/src/core/common.h b/src/core/common.h index 33d8910d..a8f19158 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -354,7 +354,7 @@ __inline__ void TRACE(char *f, ...) { } // this is re3 only, and so the function #ifndef MASTER #define assert(_Expression) (void)( (!!(_Expression)) || (re3_assert(#_Expression, __FILE__, __LINE__, __FUNCTION__), 0) ) #else -#define assert(_Expression) +#define assert(_Expression) (_Expression) #endif #define ASSERT assert |