From f045ce438696d2425b7a3058f12ee04098fb1597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Fri, 5 Jun 2020 23:13:31 +0300 Subject: Bike riding anims, SA bike/heli cam --- src/vehicles/Bike.cpp | 12 ++++++------ src/vehicles/Bike.h | 6 +++--- src/vehicles/Vehicle.cpp | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/vehicles') diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp index e6a82288..e7dad2df 100644 --- a/src/vehicles/Bike.cpp +++ b/src/vehicles/Bike.cpp @@ -86,8 +86,8 @@ CBike::CBike(int32 id, uint8 CreatedBy) m_fGasPedal = 0.0f; m_fBrakePedal = 0.0f; m_fLeanInput = 0.0f; - field_478 = 0; - field_47C = 0; + m_fPedLeanAmountLR = 0.0f; + m_fPedLeanAmountUD = 0.0f; m_pSetOnFireEntity = nil; m_pBombRigger = nil; m_fGasPedalAudio = 0.0f; @@ -307,8 +307,8 @@ CBike::ProcessControl(void) m_nCarHornTimer = 0; bCanStand = (pDriver || pPassengers[0] || bIsBeingCarJacked) && !bIsStanding; - field_478 = 0; - field_47C = 0; + m_fPedLeanAmountLR = 0.0f; + m_fPedLeanAmountUD = 0.0f; m_bike_flag80 = false; if(bIsBeingCarJacked){ @@ -331,8 +331,8 @@ CBike::ProcessControl(void) bCanStand = false; m_bike_flag80 = false; - field_478 = 0; - field_47C = 0; + m_fPedLeanAmountLR = 0.0f; + m_fPedLeanAmountUD = 0.0f; break; case STATUS_PLAYER_DISABLED: diff --git a/src/vehicles/Bike.h b/src/vehicles/Bike.h index aa85942d..f3f63657 100644 --- a/src/vehicles/Bike.h +++ b/src/vehicles/Bike.h @@ -62,8 +62,8 @@ public: float m_fLeanLRAngle; float m_fLeanLRAngle2; float m_fLeanInput; - uint32 field_478; - uint32 field_47C; + float m_fPedLeanAmountLR; + float m_fPedLeanAmountUD; uint8 m_bike_unused2; uint8 unused[3]; // looks like padding..but for what? uint8 m_bike_flag01 : 1; @@ -73,7 +73,7 @@ public: uint8 bIsStanding : 1; uint8 bExtraSpeed : 1; // leaning forward uint8 m_bike_flag40 : 1; - uint8 m_bike_flag80 : 1; + uint8 m_bike_flag80 : 1; // doing wheelie? int16 m_doingBurnout; float m_fTireTemperature; float m_fBrakeDestabilization; diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 764e49cc..7e7be037 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -2289,7 +2289,7 @@ CVehicle::KillPedsInVehicle(void) if(!pDriver->IsPlayer()) pDriver->FlagToDestroyWhenNextProcessed(); }else - pDriver->SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f); + pDriver->SetDie(); } for(i = 0; i < m_nNumMaxPassengers; i++){ if(pPassengers[i]){ @@ -2299,7 +2299,7 @@ CVehicle::KillPedsInVehicle(void) if(!pPassengers[i]->IsPlayer()) pPassengers[i]->FlagToDestroyWhenNextProcessed(); }else - pPassengers[i]->SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f); + pPassengers[i]->SetDie(); } } } -- cgit v1.2.3