mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-11-24 01:59:15 +01:00
Merge branch 'master' into miami
This commit is contained in:
commit
1ef8d61f36
@ -4489,7 +4489,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){
|
||||
|
@ -56,6 +56,11 @@ public:
|
||||
|
||||
friend bool GenericLoad(void);
|
||||
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
|
||||
|
@ -349,8 +349,13 @@ CWaterLevel::RenderWater()
|
||||
|
||||
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_ADDV += CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV;
|
||||
#endif
|
||||
}
|
||||
|
||||
if ( TEXTURE_ADDU >= 1.0f )
|
||||
|
Loading…
Reference in New Issue
Block a user