archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-11-04 12:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge upstream

Browse Source
This commit is contained in:
Roman Masanin
2020-11-08 16:23:05 +03:00
parent 89b622eea8 a2e0373d22
commit 23d23f6462
20 changed files with 3298 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vehicles/Bike.cpp
View File

@@ -792,7 +792,7 @@ CBike::ProcessControl(void)
CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[rearLine].surfaceB) == ADHESIVE_SAND)
steer *= pBikeHandling->fSlipSteer;
f = Asin(Min(steer/SQR(fwdSpeed), 1.0))/DEGTORAD(pHandling->fSteeringLock);
if(m_fSteerAngle < 0.0f && m_fLeanLRAngle < 0.0f &&
if(m_fSteerAngle < 0.0f && m_fLeanLRAngle < 0.0f ||
m_fSteerAngle > 0.0f && m_fLeanLRAngle > 0.0f)
f *= 2.0f;
f = Min(f, 1.0f);

4
src/vehicles/Boat.cpp
View File

@@ -1,4 +1,4 @@
#include "common.h"
#include "common.h"
#include "General.h"
#include "Timecycle.h"
@@ -145,7 +145,7 @@ CBoat::ProcessControl(void)
AutoPilot.m_nCarMission == MISSION_BLOCKPLAYER_CLOSE ||
AutoPilot.m_nCarMission == MISSION_ATTACKPLAYER) &&
CTimer::GetTimeInMilliseconds() > m_nPoliceShoutTimer){
DMAudio.PlayOneShot(m_audioEntityId, SOUND_115, 0.0f);
DMAudio.PlayOneShot(m_audioEntityId, SOUND_PED_VCPA_PLAYER_FOUND, 0.0f);
m_nPoliceShoutTimer = CTimer::GetTimeInMilliseconds() + 4500 + (CGeneral::GetRandomNumber()&0xFFF);
}
}