mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-16 01:39:01 +00:00
Code Issues Projects Releases Wiki Activity

synch with re3

Browse source
This commit is contained in:
aap 2020-06-21 14:50:31 +02:00
parent 7700970c93
commit e563450cb6
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/Camera.cpp
View file

@ -2292,6 +2292,10 @@ CCamera::StartTransition(int16 newMode)
Cams[ActiveCam].BetaSpeed = 0.0f; Cams[ActiveCam].BetaSpeed = 0.0f;
break; break;
case CCam::MODE_BEHINDBOAT:
Cams[ActiveCam].BetaSpeed = 0.0f;
break;
case CCam::MODE_FOLLOWPED: case CCam::MODE_FOLLOWPED:
// Getting out of vehicle normally // Getting out of vehicle normally
betaOffset = DEGTORAD(55.0f); betaOffset = DEGTORAD(55.0f);
@ -2386,10 +2390,6 @@ CCamera::StartTransition(int16 newMode)
Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y); Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y);
break; break;
case CCam::MODE_BEHINDBOAT:
Cams[ActiveCam].BetaSpeed = 0.0f;
break;
case CCam::MODE_PED_DEAD_BABY: case CCam::MODE_PED_DEAD_BABY:
Cams[ActiveCam].Alpha = DEGTORAD(15.0f); Cams[ActiveCam].Alpha = DEGTORAD(15.0f);
break; break;

1
src/core/Pad.h
View file

@ -444,6 +444,7 @@ public:
bool GetLeftShoulder2(void) { return !!NewState.LeftShoulder2; } bool GetLeftShoulder2(void) { return !!NewState.LeftShoulder2; }
bool GetRightShoulder1(void) { return !!NewState.RightShoulder1; } bool GetRightShoulder1(void) { return !!NewState.RightShoulder1; }
bool GetRightShoulder2(void) { return !!NewState.RightShoulder2; } bool GetRightShoulder2(void) { return !!NewState.RightShoulder2; }
bool GetStart() { return !!NewState.Start; }
int16 GetLeftStickX(void) { return NewState.LeftStickX; } int16 GetLeftStickX(void) { return NewState.LeftStickX; }
int16 GetLeftStickY(void) { return NewState.LeftStickY; } int16 GetLeftStickY(void) { return NewState.LeftStickY; }
int16 GetRightStickX(void) { return NewState.RightStickX; } int16 GetRightStickX(void) { return NewState.RightStickX; }