a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 09:00:01 +00:00
Code Issues Projects Releases Wiki Activity

Vehicle: Automobile: more pointless fixes

Browse source
This commit is contained in:
erorcun 2021-01-05 04:41:24 +03:00
parent 32d3ea0a2d
commit 0d3e6a3dce
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vehicles/Automobile.cpp
View file

@ -260,6 +260,7 @@ CAutomobile::ProcessControl(void)
int i; int i;
float wheelRot; float wheelRot;
CColModel *colModel; CColModel *colModel;
float brake = 0.0f;
if(bUsingSpecialColModel) if(bUsingSpecialColModel)
colModel = &CWorld::Players[CWorld::PlayerInFocus].m_ColModel; colModel = &CWorld::Players[CWorld::PlayerInFocus].m_ColModel;
@ -450,7 +451,7 @@ CAutomobile::ProcessControl(void)
m_fBrakePedal = 1.0f; m_fBrakePedal = 1.0f;
m_fGasPedal = 0.0f; m_fGasPedal = 0.0f;
} }
if(CPad::GetPad(0)->WeaponJustDown()) if(CPad::GetPad(0)->CarGunJustDown())
ActivateBomb(); ActivateBomb();
break; break;
@ -682,7 +683,6 @@ CAutomobile::ProcessControl(void)
AutoPilot.m_nCarMission == MISSION_PLANE_FLYTOCOORS) AutoPilot.m_nCarMission == MISSION_PLANE_FLYTOCOORS)
skipPhysics = true; skipPhysics = true;
float brake;
if(skipPhysics){ if(skipPhysics){
bHasContacted = false; bHasContacted = false;
bIsInSafePosition = false; bIsInSafePosition = false;

3
src/vehicles/Vehicle.cpp
View file

@ -149,6 +149,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
m_nAlarmState = 0; m_nAlarmState = 0;
m_nDoorLock = CARLOCK_UNLOCKED; m_nDoorLock = CARLOCK_UNLOCKED;
m_nLastWeaponDamage = -1; m_nLastWeaponDamage = -1;
m_pLastDamageEntity = nil;
m_fMapObjectHeightAhead = m_fMapObjectHeightBehind = 0.0f; m_fMapObjectHeightAhead = m_fMapObjectHeightBehind = 0.0f;
m_audioEntityId = DMAudio.CreateEntity(AUDIOTYPE_PHYSICAL, this); m_audioEntityId = DMAudio.CreateEntity(AUDIOTYPE_PHYSICAL, this);
if(m_audioEntityId >= 0) if(m_audioEntityId >= 0)
@ -839,7 +840,7 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon
if(IsBike()) if(IsBike())
brake = 0.6f * mod_HandlingManager.fWheelFriction / (pHandling->fMass + 200.0f); brake = 0.6f * mod_HandlingManager.fWheelFriction / (pHandling->fMass + 200.0f);
else if(pHandling->fMass < 500.0f) else if(pHandling->fMass < 500.0f)
brake = mod_HandlingManager.fWheelFriction / pHandling->fMass; brake = 0.2f * mod_HandlingManager.fWheelFriction / pHandling->fMass;
else if(GetModelIndex() == MI_RCBANDIT) else if(GetModelIndex() == MI_RCBANDIT)
brake = 0.2f * mod_HandlingManager.fWheelFriction / pHandling->fMass; brake = 0.2f * mod_HandlingManager.fWheelFriction / pHandling->fMass;
else else