Nofated095
/
re-GTA
mirror of https://github.com/Nofated095/re-GTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:GTAmodding/re3

This commit is contained in:
aap 2020-05-08 20:58:48 +02:00
parent f12e76fa13 e0b3418e65
commit 10cade9f60
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Cam.cpp
View File

@ -4489,7 +4489,7 @@ CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrient
*/ */
{ {
LookLeftRight = -CPad::GetPad(0)->LookAroundLeftRight(); LookLeftRight = -CPad::GetPad(0)->LookAroundLeftRight();
LookUpDown = CPad::GetPad(0)->LookAroundUpDown(); LookUpDown = -CPad::GetPad(0)->LookAroundUpDown();
} }
float AlphaOffset, BetaOffset; float AlphaOffset, BetaOffset;
if(UseMouse){ if(UseMouse){

5
src/core/Timer.h
View File

@ -56,6 +56,11 @@ public:
friend bool GenericLoad(void); friend bool GenericLoad(void);
friend bool GenericSave(int file); friend bool GenericSave(int file);
#ifdef FIX_BUGS
static float GetDefaultTimeStep(void) { return 5.0f / 3.0f; }
static float GetTimeStepFix(void) { return GetTimeStep() / GetDefaultTimeStep(); }
#endif
}; };
#ifdef FIX_BUGS #ifdef FIX_BUGS

5
src/render/WaterLevel.cpp
View File

@ -351,8 +351,13 @@ CWaterLevel::RenderWater()
if ( !CTimer::GetIsPaused() ) if ( !CTimer::GetIsPaused() )
{ {
#ifdef FIX_BUGS
TEXTURE_ADDU += (CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV) * CTimer::GetTimeStepFix();
TEXTURE_ADDV += (CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV) * CTimer::GetTimeStepFix();
#else
TEXTURE_ADDU += CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV; TEXTURE_ADDU += CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV;
TEXTURE_ADDV += CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV; TEXTURE_ADDV += CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV;
#endif
} }
if ( TEXTURE_ADDU >= 1.0f ) if ( TEXTURE_ADDU >= 1.0f )