archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-29 17:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'carctrl_dev'

Browse Source
This commit is contained in:
Nikolay Korolev
2019-09-14 20:54:56 +03:00
parent 06be2f772a 57f24ad533
commit 84186e7b0f
11 changed files with 669 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehicles/Automobile.cpp
View File

@ -3074,7 +3074,7 @@ CAutomobile::PlaceOnRoadProperly(void)
frontZ = point.point.z;
m_pCurGroundEntity = entity;
}else{
frontZ = field_21C;
frontZ = m_fMapObjectHeightAhead;
}
CVector rear(GetPosition().x - GetForward().x*lenBack,
@ -3085,7 +3085,7 @@ CAutomobile::PlaceOnRoadProperly(void)
rearZ = point.point.z;
m_pCurGroundEntity = entity;
}else{
rearZ = field_220;
rearZ = m_fMapObjectHeightBehind;
}
float len = lenFwd + lenBack;

5
src/vehicles/Vehicle.cpp
View File

@ -78,7 +78,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
m_veh_flagD1 = false;
m_veh_flagD2 = false;
m_nGunFiringTime = 0;
field_214 = 0;
m_nTimeBlocked = 0;
bLightsOn = false;
bVehicleColProcessed = false;
m_numPedsUseItAsCover = 0;
@ -90,8 +90,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
m_nAlarmState = 0;
m_nDoorLock = CARLOCK_UNLOCKED;
m_nLastWeaponDamage = -1;
field_220 = 0.0;
field_21C = field_220;
m_fMapObjectHeightAhead = m_fMapObjectHeightBehind = 0.0f;
m_audioEntityId = DMAudio.CreateEntity(AUDIOTYPE_PHYSICAL, this);
if(m_audioEntityId)
DMAudio.SetEntityStatus(m_audioEntityId, true);

6
src/vehicles/Vehicle.h
View File

@ -183,11 +183,11 @@ public:
float m_fChangeGearTime;
uint32 m_nGunFiringTime; // last time when gun on vehicle was fired (used on boats)
uint32 m_nTimeOfDeath;
int16 field_214;
uint16 m_nTimeBlocked;
int16 m_nBombTimer; // goes down with each frame
CEntity *m_pBlowUpEntity;
float field_21C; // front Z?
float field_220; // rear Z?
float m_fMapObjectHeightAhead; // front Z?
float m_fMapObjectHeightBehind; // rear Z?
eCarLock m_nDoorLock;
int8 m_nLastWeaponDamage; // see eWeaponType, -1 if no damage
int8 m_nRadioStation;