mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-24 18:20:00 +00:00
CBike done
This commit is contained in:
parent
db9057f5a8
commit
5711159e68
|
@ -6797,7 +6797,7 @@ CPed::EnterCar(void)
|
||||||
LineUpPedWithCar(LINE_UP_TO_CAR_START);
|
LineUpPedWithCar(LINE_UP_TO_CAR_START);
|
||||||
if (veh->IsBike()) {
|
if (veh->IsBike()) {
|
||||||
CBike *bike = (CBike*)veh;
|
CBike *bike = (CBike*)veh;
|
||||||
if (bike->GetStatus() != STATUS_ABANDONED || bike->m_bike_flag08 || !m_pVehicleAnim) {
|
if (bike->GetStatus() != STATUS_ABANDONED || bike->bIsBeingPickedUp || !m_pVehicleAnim) {
|
||||||
if (m_nPedState == PED_CARJACK && m_pVehicleAnim) {
|
if (m_nPedState == PED_CARJACK && m_pVehicleAnim) {
|
||||||
if (m_pVehicleAnim->currentTime > 0.4f && m_pVehicleAnim->currentTime - m_pVehicleAnim->timeStep <= 0.4f) {
|
if (m_pVehicleAnim->currentTime > 0.4f && m_pVehicleAnim->currentTime - m_pVehicleAnim->timeStep <= 0.4f) {
|
||||||
int anim = m_pVehicleAnim->animId;
|
int anim = m_pVehicleAnim->animId;
|
||||||
|
@ -6813,9 +6813,9 @@ CPed::EnterCar(void)
|
||||||
|
|
||||||
// One is pickup and other one is pullup, not same :p
|
// One is pickup and other one is pullup, not same :p
|
||||||
if ((anim == ANIM_BIKE_PICKUP_R || anim == ANIM_BIKE_PICKUP_L) && m_pVehicleAnim->currentTime > 0.4667f)
|
if ((anim == ANIM_BIKE_PICKUP_R || anim == ANIM_BIKE_PICKUP_L) && m_pVehicleAnim->currentTime > 0.4667f)
|
||||||
bike->m_bike_flag08 = true;
|
bike->bIsBeingPickedUp = true;
|
||||||
else if ((anim == ANIM_BIKE_PULLUP_R || anim == ANIM_BIKE_PULLUP_L) && m_pVehicleAnim->currentTime > 0.4667f)
|
else if ((anim == ANIM_BIKE_PULLUP_R || anim == ANIM_BIKE_PULLUP_L) && m_pVehicleAnim->currentTime > 0.4667f)
|
||||||
bike->m_bike_flag08 = true;
|
bike->bIsBeingPickedUp = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -421,7 +421,7 @@ CAutomobile::ProcessControl(void)
|
||||||
m_aSuspensionSpringRatio[3] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[3].surfaceB) == ADHESIVE_SAND){
|
m_aSuspensionSpringRatio[3] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[3].surfaceB) == ADHESIVE_SAND){
|
||||||
if(GetModelIndex() != MI_RCBANDIT && GetModelIndex() != MI_RHINO){
|
if(GetModelIndex() != MI_RCBANDIT && GetModelIndex() != MI_RHINO){
|
||||||
float slowdown;
|
float slowdown;
|
||||||
CVector parallelSpeed = m_vecMoveSpeed - DotProduct(m_vecMoveSpeed, GetUp())*m_vecMoveSpeed;
|
CVector parallelSpeed = m_vecMoveSpeed - DotProduct(m_vecMoveSpeed, GetUp())*GetUp();
|
||||||
float fSpeed = parallelSpeed.MagnitudeSqr();
|
float fSpeed = parallelSpeed.MagnitudeSqr();
|
||||||
if(fSpeed > SQR(0.3f)){
|
if(fSpeed > SQR(0.3f)){
|
||||||
fSpeed = Sqrt(fSpeed);
|
fSpeed = Sqrt(fSpeed);
|
||||||
|
@ -752,7 +752,7 @@ CAutomobile::ProcessControl(void)
|
||||||
fwdSpeed *= 0.7f;
|
fwdSpeed *= 0.7f;
|
||||||
float f = 1.0f - fwdSpeed/0.3f - 0.7f*CWeather::WetRoads;
|
float f = 1.0f - fwdSpeed/0.3f - 0.7f*CWeather::WetRoads;
|
||||||
f = Max(f, 0.4f);
|
f = Max(f, 0.4f);
|
||||||
m_aSuspensionSpringRatio[i] += f*(m_aSuspensionLineLength[i]-m_aSuspensionSpringLength[i])/m_aSuspensionSpringLength[i];
|
m_aSuspensionSpringRatio[i] += 0.35f*f*(m_aSuspensionLineLength[i]-m_aSuspensionSpringLength[i])/m_aSuspensionSpringLength[i];
|
||||||
if(m_aSuspensionSpringRatio[i] > 1.0f)
|
if(m_aSuspensionSpringRatio[i] > 1.0f)
|
||||||
m_aSuspensionSpringRatio[i] = 1.0f;
|
m_aSuspensionSpringRatio[i] = 1.0f;
|
||||||
}
|
}
|
||||||
|
@ -1860,7 +1860,7 @@ CAutomobile::PreRender(void)
|
||||||
if(Damage.GetWheelStatus(i) == WHEEL_STATUS_BURST && m_aSuspensionSpringRatioPrev[i] < 1.0f){
|
if(Damage.GetWheelStatus(i) == WHEEL_STATUS_BURST && m_aSuspensionSpringRatioPrev[i] < 1.0f){
|
||||||
static float speedSq;
|
static float speedSq;
|
||||||
speedSq = m_vecMoveSpeed.MagnitudeSqr();
|
speedSq = m_vecMoveSpeed.MagnitudeSqr();
|
||||||
if(speedSq > 0.01f &&
|
if(speedSq > SQR(0.1f) &&
|
||||||
m_aWheelColPoints[i].surfaceB != SURFACE_GRASS &&
|
m_aWheelColPoints[i].surfaceB != SURFACE_GRASS &&
|
||||||
m_aWheelColPoints[i].surfaceB != SURFACE_MUD_DRY &&
|
m_aWheelColPoints[i].surfaceB != SURFACE_MUD_DRY &&
|
||||||
m_aWheelColPoints[i].surfaceB != SURFACE_SAND &&
|
m_aWheelColPoints[i].surfaceB != SURFACE_SAND &&
|
||||||
|
@ -3847,7 +3847,7 @@ CAutomobile::DoDriveByShootings(void)
|
||||||
|
|
||||||
if (!anim || !anim->IsRunning()) {
|
if (!anim || !anim->IsRunning()) {
|
||||||
if (CPad::GetPad(0)->GetCarGunFired() && CTimer::GetTimeInMilliseconds() > weapon->m_nTimer) {
|
if (CPad::GetPad(0)->GetCarGunFired() && CTimer::GetTimeInMilliseconds() > weapon->m_nTimer) {
|
||||||
weapon->FireFromCar(this, lookingLeft);
|
weapon->FireFromCar(this, lookingLeft, true);
|
||||||
weapon->m_nTimer = CTimer::GetTimeInMilliseconds() + 70;
|
weapon->m_nTimer = CTimer::GetTimeInMilliseconds() + 70;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4450,25 +4450,16 @@ CAutomobile::AddWheelDirtAndWater(CColPoint *colpoint, uint32 belowEffectSpeed)
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
default:
|
default:
|
||||||
if ( CWeather::WetRoads > 0.01f
|
if(CWeather::WetRoads > 0.01f){
|
||||||
#ifdef PC_PARTICLE
|
if(CTimer::GetFrameCounter() & 1)
|
||||||
&& CTimer::GetFrameCounter() & 1
|
CParticle::AddParticle(
|
||||||
#endif
|
PARTICLE_WATERSPRAY,
|
||||||
)
|
colpoint->point + CVector(0.0f, 0.0f, 0.25f+0.25f),
|
||||||
{
|
CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.005f, 0.04f)),
|
||||||
CParticle::AddParticle(
|
nil,
|
||||||
#ifdef FIX_BUGS
|
CGeneral::GetRandomNumberInRange(0.1f, 0.5f), waterCol);
|
||||||
PARTICLE_WHEEL_WATER,
|
|
||||||
#else
|
|
||||||
PARTICLE_WATERSPRAY,
|
|
||||||
#endif
|
|
||||||
colpoint->point + CVector(0.0f, 0.0f, 0.25f+0.25f),
|
|
||||||
CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.005f, 0.04f)),
|
|
||||||
nil,
|
|
||||||
CGeneral::GetRandomNumberInRange(0.1f, 0.5f), waterCol);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#include "General.h"
|
#include "General.h"
|
||||||
#include "Pad.h"
|
#include "Pad.h"
|
||||||
#include "DMAudio.h"
|
#include "DMAudio.h"
|
||||||
|
#include "Clock.h"
|
||||||
#include "Timecycle.h"
|
#include "Timecycle.h"
|
||||||
#include "ZoneCull.h"
|
#include "ZoneCull.h"
|
||||||
#include "Camera.h"
|
#include "Camera.h"
|
||||||
|
@ -10,10 +11,15 @@
|
||||||
#include "Explosion.h"
|
#include "Explosion.h"
|
||||||
#include "Particle.h"
|
#include "Particle.h"
|
||||||
#include "ParticleObject.h"
|
#include "ParticleObject.h"
|
||||||
|
#include "Shadows.h"
|
||||||
|
#include "PointLights.h"
|
||||||
|
#include "Coronas.h"
|
||||||
|
#include "SpecialFX.h"
|
||||||
#include "WaterLevel.h"
|
#include "WaterLevel.h"
|
||||||
#include "Floater.h"
|
#include "Floater.h"
|
||||||
#include "World.h"
|
#include "World.h"
|
||||||
#include "SurfaceTable.h"
|
#include "SurfaceTable.h"
|
||||||
|
#include "Weather.h"
|
||||||
#include "Record.h"
|
#include "Record.h"
|
||||||
#include "CarCtrl.h"
|
#include "CarCtrl.h"
|
||||||
#include "CarAI.h"
|
#include "CarAI.h"
|
||||||
|
@ -31,6 +37,23 @@
|
||||||
#include "Bike.h"
|
#include "Bike.h"
|
||||||
#include "Debug.h"
|
#include "Debug.h"
|
||||||
|
|
||||||
|
//--MIAMI: done except for TODOs
|
||||||
|
// BUGS: bikes get stuck in sand for some reason
|
||||||
|
|
||||||
|
// TODO: maybe put this somewhere else
|
||||||
|
inline void
|
||||||
|
GetRelativeMatrix(RwMatrix *mat, RwFrame *frm, RwFrame *end)
|
||||||
|
{
|
||||||
|
*mat = *RwFrameGetMatrix(frm);
|
||||||
|
frm = RwFrameGetParent(frm);
|
||||||
|
while(frm){
|
||||||
|
RwMatrixTransform(mat, RwFrameGetMatrix(frm), rwCOMBINEPOSTCONCAT);
|
||||||
|
frm = RwFrameGetParent(frm);
|
||||||
|
if(frm == end)
|
||||||
|
frm = nil;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#define FAKESUSPENSION (99999.992f)
|
#define FAKESUSPENSION (99999.992f)
|
||||||
|
|
||||||
CBike::CBike(int32 id, uint8 CreatedBy)
|
CBike::CBike(int32 id, uint8 CreatedBy)
|
||||||
|
@ -99,7 +122,7 @@ CBike::CBike(int32 id, uint8 CreatedBy)
|
||||||
m_fGasPedalAudio = 0.0f;
|
m_fGasPedalAudio = 0.0f;
|
||||||
m_bike_flag02 = false;
|
m_bike_flag02 = false;
|
||||||
bWaterTight = false;
|
bWaterTight = false;
|
||||||
m_bike_flag08 = false;
|
bIsBeingPickedUp = false;
|
||||||
bIsStanding = false;
|
bIsStanding = false;
|
||||||
bExtraSpeed = false;
|
bExtraSpeed = false;
|
||||||
bIsOnFire = false;
|
bIsOnFire = false;
|
||||||
|
@ -181,7 +204,7 @@ CBike::ProcessControl(void)
|
||||||
int i;
|
int i;
|
||||||
float wheelRot;
|
float wheelRot;
|
||||||
float acceleration = 0.0f;
|
float acceleration = 0.0f;
|
||||||
bool bCanStand = false;
|
bool bBalancedByRider = false;
|
||||||
bool bStuckInSand = false;
|
bool bStuckInSand = false;
|
||||||
float brake = 0.0f;
|
float brake = 0.0f;
|
||||||
CColModel *colModel = GetColModel();
|
CColModel *colModel = GetColModel();
|
||||||
|
@ -208,8 +231,8 @@ CBike::ProcessControl(void)
|
||||||
|
|
||||||
switch(GetStatus()){
|
switch(GetStatus()){
|
||||||
case STATUS_PLAYER:
|
case STATUS_PLAYER:
|
||||||
bCanStand = true;
|
bBalancedByRider = true;
|
||||||
m_bike_flag08 = false;
|
bIsBeingPickedUp = false;
|
||||||
if(FindPlayerPed()->GetPedState() != PED_EXIT_CAR && FindPlayerPed()->GetPedState() != PED_DRAG_FROM_CAR){
|
if(FindPlayerPed()->GetPedState() != PED_EXIT_CAR && FindPlayerPed()->GetPedState() != PED_DRAG_FROM_CAR){
|
||||||
ProcessControlInputs(0);
|
ProcessControlInputs(0);
|
||||||
|
|
||||||
|
@ -270,7 +293,7 @@ CBike::ProcessControl(void)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case STATUS_PLAYER_PLAYBACKFROMBUFFER:
|
case STATUS_PLAYER_PLAYBACKFROMBUFFER:
|
||||||
bCanStand = true;
|
bBalancedByRider = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case STATUS_SIMPLE:
|
case STATUS_SIMPLE:
|
||||||
|
@ -301,7 +324,7 @@ CBike::ProcessControl(void)
|
||||||
CCarCtrl::SteerAICarWithPhysics(this);
|
CCarCtrl::SteerAICarWithPhysics(this);
|
||||||
PlayHornIfNecessary();
|
PlayHornIfNecessary();
|
||||||
|
|
||||||
bCanStand = true;
|
bBalancedByRider = true;
|
||||||
m_bike_flag80 = false;
|
m_bike_flag80 = false;
|
||||||
|
|
||||||
if(bIsBeingCarJacked){
|
if(bIsBeingCarJacked){
|
||||||
|
@ -309,7 +332,7 @@ CBike::ProcessControl(void)
|
||||||
m_fBrakePedal = 1.0f;
|
m_fBrakePedal = 1.0f;
|
||||||
bIsHandbrakeOn = true;
|
bIsHandbrakeOn = true;
|
||||||
}else
|
}else
|
||||||
m_bike_flag08 = false;
|
bIsBeingPickedUp = false;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case STATUS_ABANDONED:
|
case STATUS_ABANDONED:
|
||||||
|
@ -325,7 +348,7 @@ CBike::ProcessControl(void)
|
||||||
#endif
|
#endif
|
||||||
m_nCarHornTimer = 0;
|
m_nCarHornTimer = 0;
|
||||||
|
|
||||||
bCanStand = (pDriver || pPassengers[0] || bIsBeingCarJacked) && !bIsStanding;
|
bBalancedByRider = (pDriver || pPassengers[0] || bIsBeingCarJacked) && !bIsStanding;
|
||||||
m_fPedLeanAmountLR = 0.0f;
|
m_fPedLeanAmountLR = 0.0f;
|
||||||
m_fPedLeanAmountUD = 0.0f;
|
m_fPedLeanAmountUD = 0.0f;
|
||||||
m_bike_flag80 = false;
|
m_bike_flag80 = false;
|
||||||
|
@ -348,7 +371,7 @@ CBike::ProcessControl(void)
|
||||||
#endif
|
#endif
|
||||||
m_nCarHornTimer = 0;
|
m_nCarHornTimer = 0;
|
||||||
|
|
||||||
bCanStand = false;
|
bBalancedByRider = false;
|
||||||
m_bike_flag80 = false;
|
m_bike_flag80 = false;
|
||||||
m_fPedLeanAmountLR = 0.0f;
|
m_fPedLeanAmountLR = 0.0f;
|
||||||
m_fPedLeanAmountUD = 0.0f;
|
m_fPedLeanAmountUD = 0.0f;
|
||||||
|
@ -370,7 +393,7 @@ CBike::ProcessControl(void)
|
||||||
#endif
|
#endif
|
||||||
m_nCarHornTimer = 0;
|
m_nCarHornTimer = 0;
|
||||||
|
|
||||||
bCanStand = true;
|
bBalancedByRider = true;
|
||||||
m_bike_flag80 = false;
|
m_bike_flag80 = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -379,7 +402,7 @@ CBike::ProcessControl(void)
|
||||||
if(Abs(GetRight().z) > 0.35f || Abs(GetForward().z) > 0.5f)
|
if(Abs(GetRight().z) > 0.35f || Abs(GetForward().z) > 0.5f)
|
||||||
bIsStanding = false;
|
bIsStanding = false;
|
||||||
|
|
||||||
if(bCanStand || m_bike_flag08 || bIsStanding){
|
if(bBalancedByRider || bIsBeingPickedUp || bIsStanding){
|
||||||
float fDx = fDAxisX;
|
float fDx = fDAxisX;
|
||||||
CVector res = vecTestResistance;
|
CVector res = vecTestResistance;
|
||||||
CVector localTurnSpeed = Multiply3x3(m_vecTurnSpeed, GetMatrix());
|
CVector localTurnSpeed = Multiply3x3(m_vecTurnSpeed, GetMatrix());
|
||||||
|
@ -421,7 +444,7 @@ CBike::ProcessControl(void)
|
||||||
|
|
||||||
// Skip physics if object is found to have been static recently
|
// Skip physics if object is found to have been static recently
|
||||||
bool skipPhysics = false;
|
bool skipPhysics = false;
|
||||||
if(!bIsStuck && (GetStatus() == STATUS_ABANDONED || GetStatus() == STATUS_WRECKED) && !m_bike_flag08){
|
if(!bIsStuck && (GetStatus() == STATUS_ABANDONED || GetStatus() == STATUS_WRECKED) && !bIsBeingPickedUp){
|
||||||
bool makeStatic = false;
|
bool makeStatic = false;
|
||||||
float moveSpeedLimit, turnSpeedLimit, distanceLimit;
|
float moveSpeedLimit, turnSpeedLimit, distanceLimit;
|
||||||
|
|
||||||
|
@ -529,7 +552,7 @@ CBike::ProcessControl(void)
|
||||||
bIsStuck = false;
|
bIsStuck = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!(bCanStand || m_bike_flag08 || bIsStanding)){
|
if(!(bBalancedByRider || bIsBeingPickedUp || bIsStanding)){
|
||||||
if(GetRight().z < 0.0f){
|
if(GetRight().z < 0.0f){
|
||||||
if(m_fSteerAngle > -DEGTORAD(25.0f))
|
if(m_fSteerAngle > -DEGTORAD(25.0f))
|
||||||
m_fSteerAngle -= DEGTORAD(0.5f)*CTimer::GetTimeStep();
|
m_fSteerAngle -= DEGTORAD(0.5f)*CTimer::GetTimeStep();
|
||||||
|
@ -748,7 +771,7 @@ CBike::ProcessControl(void)
|
||||||
traction *= pHandling->fTractionMultiplier / 4.0f;
|
traction *= pHandling->fTractionMultiplier / 4.0f;
|
||||||
|
|
||||||
// Turn wheel
|
// Turn wheel
|
||||||
if(GetStatus() == STATUS_PLAYER || !bIsStanding || m_bike_flag08){
|
if(GetStatus() == STATUS_PLAYER || !bIsStanding || bIsBeingPickedUp){
|
||||||
if(Abs(m_vecMoveSpeed.x) < 0.01f && Abs(m_vecMoveSpeed.y) < 0.01f && m_fSteerAngle == 0.0f){
|
if(Abs(m_vecMoveSpeed.x) < 0.01f && Abs(m_vecMoveSpeed.y) < 0.01f && m_fSteerAngle == 0.0f){
|
||||||
m_fWheelAngle *= Pow(0.96f, CTimer::GetTimeStep());
|
m_fWheelAngle *= Pow(0.96f, CTimer::GetTimeStep());
|
||||||
}else{
|
}else{
|
||||||
|
@ -987,7 +1010,7 @@ CBike::ProcessControl(void)
|
||||||
if(assoc)
|
if(assoc)
|
||||||
idleAngle = DEGTORAD(10.0f) * assoc->blendAmount;
|
idleAngle = DEGTORAD(10.0f) * assoc->blendAmount;
|
||||||
}
|
}
|
||||||
if(bCanStand || m_bike_flag08){
|
if(bBalancedByRider || bIsBeingPickedUp){
|
||||||
m_vecAvgSurfaceRight = CrossProduct(GetForward(), m_vecAvgSurfaceNormal);
|
m_vecAvgSurfaceRight = CrossProduct(GetForward(), m_vecAvgSurfaceNormal);
|
||||||
m_vecAvgSurfaceRight.Normalise();
|
m_vecAvgSurfaceRight.Normalise();
|
||||||
float lean;
|
float lean;
|
||||||
|
@ -1182,11 +1205,11 @@ CBike::ProcessControl(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Balance bike
|
// Balance bike
|
||||||
if(bCanStand || m_bike_flag08 || bIsStanding){
|
if(bBalancedByRider || bIsBeingPickedUp || bIsStanding){
|
||||||
float onSideness = clamp(DotProduct(GetRight(), m_vecAvgSurfaceNormal), -1.0f, 1.0f);
|
float onSideness = clamp(DotProduct(GetRight(), m_vecAvgSurfaceNormal), -1.0f, 1.0f);
|
||||||
CVector worldCOM = Multiply3x3(GetMatrix(), m_vecCentreOfMass);
|
CVector worldCOM = Multiply3x3(GetMatrix(), m_vecCentreOfMass);
|
||||||
// Keep bike upright
|
// Keep bike upright
|
||||||
if(bCanStand){
|
if(bBalancedByRider){
|
||||||
ApplyTurnForce(-0.07f*onSideness*m_fTurnMass*GetUp()*CTimer::GetTimeStep(), worldCOM+GetRight());
|
ApplyTurnForce(-0.07f*onSideness*m_fTurnMass*GetUp()*CTimer::GetTimeStep(), worldCOM+GetRight());
|
||||||
bIsStanding = false;
|
bIsStanding = false;
|
||||||
}else
|
}else
|
||||||
|
@ -1244,11 +1267,295 @@ CBike::Teleport(CVector pos)
|
||||||
void
|
void
|
||||||
CBike::PreRender(void)
|
CBike::PreRender(void)
|
||||||
{
|
{
|
||||||
// TODO: particles and lights and such
|
int i;
|
||||||
|
CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
|
||||||
|
|
||||||
|
// Wheel particles
|
||||||
|
|
||||||
|
if(m_aWheelState[BIKEWHEEL_REAR] != WHEEL_STATE_NORMAL &&
|
||||||
|
m_aWheelColPoints[BIKESUSP_R2].surfaceB != SURFACE_WATER && m_aWheelTimer[BIKESUSP_R2] > 0.0f){
|
||||||
|
static float smokeSize = 0.2f;
|
||||||
|
CVector groundPos = m_aWheelColPoints[BIKESUSP_R2].point;
|
||||||
|
if(m_aSuspensionSpringRatioPrev[BIKESUSP_R1] < 1.0f)
|
||||||
|
groundPos = (groundPos + m_aWheelColPoints[BIKESUSP_R1].point)/2.0f;
|
||||||
|
groundPos += Sin(m_fLeanLRAngle) * 0.8f*GetColModel()->boundingBox.min.z * GetRight();
|
||||||
|
CParticle::AddParticle(PARTICLE_RUBBER_SMOKE,
|
||||||
|
groundPos + CVector(0.0f, 0.0f, 0.25f), CVector(0.0f, 0.0f, 0.0f),
|
||||||
|
nil, smokeSize);
|
||||||
|
|
||||||
|
CSkidmarks::RegisterOne((uintptr)this, groundPos, GetForward().x, GetForward().y,
|
||||||
|
m_aWheelSkidmarkType[BIKEWHEEL_REAR], &m_aWheelSkidmarkBloody[BIKEWHEEL_REAR]);
|
||||||
|
|
||||||
|
if(m_aWheelState[BIKEWHEEL_REAR] == WHEEL_STATE_SPINNING &&
|
||||||
|
(CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[BIKESUSP_R2].surfaceB) == ADHESIVE_HARD ||
|
||||||
|
CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[BIKESUSP_R2].surfaceB) == ADHESIVE_ROAD)){
|
||||||
|
CParticle::AddParticle(PARTICLE_BURNINGRUBBER_SMOKE,
|
||||||
|
groundPos + CVector(0.0f, 0.0f, 0.25f),
|
||||||
|
CVector(0.0f, 0.0f, 0.0f));
|
||||||
|
CParticle::AddParticle(PARTICLE_BURNINGRUBBER_SMOKE,
|
||||||
|
groundPos + CVector(0.0f, 0.0f, 0.25f),
|
||||||
|
CVector(0.0f, 0.0f, 0.05f));
|
||||||
|
}
|
||||||
|
}else if(m_aWheelSkidmarkBloody[BIKEWHEEL_REAR] || m_aWheelSkidmarkUnk[BIKEWHEEL_REAR]){
|
||||||
|
CVector groundPos = m_aWheelColPoints[BIKESUSP_R2].point;
|
||||||
|
groundPos += Sin(m_fLeanLRAngle) * 0.8f*GetColModel()->boundingBox.min.z * GetRight();
|
||||||
|
|
||||||
|
CSkidmarks::RegisterOne((uintptr)this, groundPos, GetForward().x, GetForward().y,
|
||||||
|
m_aWheelSkidmarkType[BIKEWHEEL_REAR], &m_aWheelSkidmarkBloody[BIKEWHEEL_REAR]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process lights
|
||||||
|
|
||||||
|
// Turn lights on/off
|
||||||
|
bool shouldLightsBeOn =
|
||||||
|
CClock::GetHours() > 20 ||
|
||||||
|
CClock::GetHours() > 19 && CClock::GetMinutes() > (m_randomSeed & 0x3F) ||
|
||||||
|
CClock::GetHours() < 7 ||
|
||||||
|
CClock::GetHours() < 8 && CClock::GetMinutes() < (m_randomSeed & 0x3F) ||
|
||||||
|
m_randomSeed/50000.0f < CWeather::Foggyness ||
|
||||||
|
m_randomSeed/50000.0f < CWeather::WetRoads;
|
||||||
|
if(shouldLightsBeOn != bLightsOn && GetStatus() != STATUS_WRECKED){
|
||||||
|
if(GetStatus() == STATUS_ABANDONED){
|
||||||
|
// Turn off lights on abandoned vehicles only when we they're far away
|
||||||
|
if(bLightsOn &&
|
||||||
|
Abs(TheCamera.GetPosition().x - GetPosition().x) + Abs(TheCamera.GetPosition().y - GetPosition().y) > 100.0f)
|
||||||
|
bLightsOn = false;
|
||||||
|
}else
|
||||||
|
bLightsOn = shouldLightsBeOn;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Actually render the lights
|
||||||
|
bool alarmOn = false;
|
||||||
|
bool alarmOff = false;
|
||||||
|
if(IsAlarmOn()){
|
||||||
|
if(CTimer::GetTimeInMilliseconds() & 0x100)
|
||||||
|
alarmOn = true;
|
||||||
|
else
|
||||||
|
alarmOff = true;
|
||||||
|
}
|
||||||
|
if(bEngineOn && bLightsOn || alarmOn || alarmOff){
|
||||||
|
CalculateLeanMatrix();
|
||||||
|
CVector lookVector = GetPosition() - TheCamera.GetPosition();
|
||||||
|
float camDist = lookVector.Magnitude();
|
||||||
|
if(camDist != 0.0f)
|
||||||
|
lookVector *= 1.0f/camDist;
|
||||||
|
else
|
||||||
|
lookVector = CVector(1.0f, 0.0f, 0.0f);
|
||||||
|
|
||||||
|
// 1.0 if directly behind car, -1.0 if in front
|
||||||
|
float behindness = DotProduct(lookVector, GetForward());
|
||||||
|
// 0.0 if behind car, PI if in front
|
||||||
|
float angle = Abs(PI/2.0f - Acos(Abs(behindness)));
|
||||||
|
|
||||||
|
// Headlight
|
||||||
|
|
||||||
|
CMatrix mat;
|
||||||
|
CVector headLightPos = mi->m_positions[CAR_POS_HEADLIGHTS];
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if(GetModelIndex() == MI_FAGGIO || GetModelIndex() == MI_PIZZABOY)
|
||||||
|
#else
|
||||||
|
if(GetModelIndex() == 152) // this is the bobcat in VC
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
mat.SetUnity();
|
||||||
|
mat.RotateZ(m_fWheelAngle);
|
||||||
|
mat = m_leanMatrix * mat;
|
||||||
|
}else
|
||||||
|
mat = m_leanMatrix;
|
||||||
|
CVector light = mat * headLightPos;
|
||||||
|
if(behindness < 0.0f){
|
||||||
|
// In front of bike
|
||||||
|
float intensity = -0.5f*behindness + 0.3f;
|
||||||
|
float size = 1.0f - behindness;
|
||||||
|
|
||||||
|
if(behindness < -0.97f && camDist < 30.0f){
|
||||||
|
// Directly in front and not too far away
|
||||||
|
if(pHandling->Flags & HANDLING_HALOGEN_LIGHTS){
|
||||||
|
CCoronas::RegisterCorona((uintptr)this + 6, 150, 150, 195, 255,
|
||||||
|
light, 1.2f, 45.0f*TheCamera.LODDistMultiplier,
|
||||||
|
CCoronas::TYPE_HEADLIGHT, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
|
||||||
|
CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, angle);
|
||||||
|
}else{
|
||||||
|
CCoronas::RegisterCorona((uintptr)this + 6, 160, 160, 140, 255,
|
||||||
|
light, 1.2f, 45.0f*TheCamera.LODDistMultiplier,
|
||||||
|
CCoronas::TYPE_HEADLIGHT, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
|
||||||
|
CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, angle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(alarmOff){
|
||||||
|
CCoronas::RegisterCorona((uintptr)this, 0, 0, 0, 0,
|
||||||
|
light, size, 0.0f,
|
||||||
|
CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
|
||||||
|
CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
|
||||||
|
}else{
|
||||||
|
if(pHandling->Flags & HANDLING_HALOGEN_LIGHTS){
|
||||||
|
CCoronas::RegisterCorona((uintptr)this + 1, 190*intensity, 190*intensity, 255*intensity, 255,
|
||||||
|
light, size, 50.0f*TheCamera.LODDistMultiplier,
|
||||||
|
CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
|
||||||
|
CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
|
||||||
|
}else{
|
||||||
|
CCoronas::RegisterCorona((uintptr)this + 1, 210*intensity, 210*intensity, 195*intensity, 255,
|
||||||
|
light, size, 50.0f*TheCamera.LODDistMultiplier,
|
||||||
|
CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
|
||||||
|
CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
CCoronas::UpdateCoronaCoors((uintptr)this, light, 50.0f*TheCamera.LODDistMultiplier, angle);
|
||||||
|
}
|
||||||
|
|
||||||
|
// bright light
|
||||||
|
CBrightLights::RegisterOne(light, GetUp(), GetRight(), GetForward(), pHandling->FrontLights + BRIGHTLIGHT_FRONT);
|
||||||
|
|
||||||
|
// Taillight
|
||||||
|
|
||||||
|
CVector tailLightPos = mi->m_positions[CAR_POS_TAILLIGHTS];
|
||||||
|
light = m_leanMatrix * tailLightPos;
|
||||||
|
|
||||||
|
// Taillight corona
|
||||||
|
if(behindness > 0.0f){
|
||||||
|
// Behind car
|
||||||
|
float intensity = 0.4f*behindness + 0.4f;
|
||||||
|
float size = (behindness + 1.0f)/2.0f;
|
||||||
|
|
||||||
|
if(m_fGasPedal < 0.0f){
|
||||||
|
// reversing
|
||||||
|
// no lights in this case
|
||||||
|
}else{
|
||||||
|
if(m_fBrakePedal > 0.0f){
|
||||||
|
intensity += 0.4f;
|
||||||
|
size += 0.3f;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(alarmOff){
|
||||||
|
CCoronas::RegisterCorona((uintptr)this + 14, 0, 0, 0, 0,
|
||||||
|
light, size, 0.0f,
|
||||||
|
CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
|
||||||
|
CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
|
||||||
|
}else{
|
||||||
|
CCoronas::RegisterCorona((uintptr)this + 14, 128*intensity, 0, 0, 255,
|
||||||
|
light, size, 50.0f*TheCamera.LODDistMultiplier,
|
||||||
|
CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
|
||||||
|
CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
CCoronas::UpdateCoronaCoors((uintptr)this + 14, light, 50.0f*TheCamera.LODDistMultiplier, angle);
|
||||||
|
}
|
||||||
|
|
||||||
|
// bright light
|
||||||
|
CBrightLights::RegisterOne(light, GetUp(), GetRight(), GetForward(), pHandling->RearLights + BRIGHTLIGHT_REAR);
|
||||||
|
|
||||||
|
// Light shadows
|
||||||
|
if(!alarmOff){
|
||||||
|
CVector pos = GetPosition();
|
||||||
|
CVector2D fwd(GetForward());
|
||||||
|
fwd.Normalise();
|
||||||
|
float f = headLightPos.y + 6.0f;
|
||||||
|
pos += CVector(f*fwd.x, f*fwd.y, 2.0f);
|
||||||
|
|
||||||
|
// TODO(MIAMI):
|
||||||
|
// CShadows::StoreCarLightShadow(this, (uintptr)this + 22, gpShadowExplosionTex, &pos,
|
||||||
|
// 7.0f*fwd.x, 7.0f*fwd.y, 3.5f*fwd.y, -3.5f*fwd.x, 45, 45, 45, 7.0f);
|
||||||
|
|
||||||
|
f = (tailLightPos.y - 2.5f) - (headLightPos.y + 6.0f);
|
||||||
|
pos += CVector(f*fwd.x, f*fwd.y, 0.0f);
|
||||||
|
// TODO(MIAMI):
|
||||||
|
// CShadows::StoreCarLightShadow(this, (uintptr)this + 25, gpShadowExplosionTex, &pos,
|
||||||
|
// 3.0f, 0.0f, 0.0f, -3.0f, 35, 0, 0, 4.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(this == FindPlayerVehicle() && !alarmOff){
|
||||||
|
CPointLights::AddLight(CPointLights::LIGHT_DIRECTIONAL, GetPosition(), GetForward(),
|
||||||
|
20.0f, 1.0f, 1.0f, 1.0f,
|
||||||
|
FindPlayerVehicle()->m_vecMoveSpeed.MagnitudeSqr2D() < sq(0.45f) ? CPointLights::FOG_NORMAL : CPointLights::FOG_NONE,
|
||||||
|
false);
|
||||||
|
CVector pos = GetPosition() - 4.0f*GetForward();
|
||||||
|
if(m_fBrakePedal > 0.0f)
|
||||||
|
CPointLights::AddLight(CPointLights::LIGHT_POINT, pos, CVector(0.0f, 0.0f, 0.0f),
|
||||||
|
10.0f, 1.0f, 0.0f, 0.0f,
|
||||||
|
CPointLights::FOG_NONE, false);
|
||||||
|
else
|
||||||
|
CPointLights::AddLight(CPointLights::LIGHT_POINT, pos, CVector(0.0f, 0.0f, 0.0f),
|
||||||
|
7.0f, 0.6f, 0.0f, 0.0f,
|
||||||
|
CPointLights::FOG_NONE, false);
|
||||||
|
}
|
||||||
|
}else if(GetStatus() != STATUS_ABANDONED && GetStatus() != STATUS_WRECKED){
|
||||||
|
// Lights off
|
||||||
|
CalculateLeanMatrix();
|
||||||
|
|
||||||
|
CVector tailLightPos = mi->m_positions[CAR_POS_TAILLIGHTS];
|
||||||
|
CVector light = m_leanMatrix * tailLightPos;
|
||||||
|
|
||||||
|
if(m_fBrakePedal > 0.0f || m_fGasPedal < 0.0f){
|
||||||
|
CVector lookVector = GetPosition() - TheCamera.GetPosition();
|
||||||
|
lookVector.Normalise();
|
||||||
|
float behindness = DotProduct(lookVector, GetForward());
|
||||||
|
if(behindness > 0.0f){
|
||||||
|
if(m_fGasPedal < 0.0f){
|
||||||
|
// reversing
|
||||||
|
// no lights in this case
|
||||||
|
}else{
|
||||||
|
// braking
|
||||||
|
CCoronas::RegisterCorona((uintptr)this + 14, 120, 0, 0, 255,
|
||||||
|
light, 1.2f, 50.0f*TheCamera.LODDistMultiplier,
|
||||||
|
CCoronas::TYPE_STAR, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
|
||||||
|
CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, 0.0f);
|
||||||
|
CBrightLights::RegisterOne(light, GetUp(), GetRight(), GetForward(), pHandling->RearLights + BRIGHTLIGHT_REAR);
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
CCoronas::UpdateCoronaCoors((uintptr)this + 14, light, 50.0f*TheCamera.LODDistMultiplier, 0.0f);
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
CCoronas::UpdateCoronaCoors((uintptr)this + 14, light, 50.0f*TheCamera.LODDistMultiplier, 0.0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Wheel particles
|
||||||
|
|
||||||
|
float fwdSpeed = DotProduct(m_vecMoveSpeed, GetForward())*180.0f;
|
||||||
|
int drawParticles = Abs(fwdSpeed) < 90.0f;
|
||||||
|
int susp = BIKESUSP_F1;
|
||||||
|
for(i = 0; i < 2; i++){
|
||||||
|
if(i == BIKEWHEEL_REAR)
|
||||||
|
susp = BIKESUSP_R1;
|
||||||
|
|
||||||
|
static float speedSq;
|
||||||
|
// Sparks for friction of burst wheels
|
||||||
|
if(m_wheelStatus[i] == WHEEL_STATUS_BURST && m_aSuspensionSpringRatioPrev[susp] < 1.0f &&
|
||||||
|
(speedSq = m_vecMoveSpeed.MagnitudeSqr(), speedSq > SQR(0.1f)) &&
|
||||||
|
m_aWheelColPoints[susp].surfaceB != SURFACE_GRASS &&
|
||||||
|
m_aWheelColPoints[susp].surfaceB != SURFACE_MUD_DRY &&
|
||||||
|
m_aWheelColPoints[susp].surfaceB != SURFACE_SAND &&
|
||||||
|
m_aWheelColPoints[susp].surfaceB != SURFACE_SAND_BEACH){
|
||||||
|
CVector normalSpeed = m_aWheelColPoints[susp].normal * DotProduct(m_aWheelColPoints[susp].normal, m_vecMoveSpeed);
|
||||||
|
CVector frictionSpeed = m_vecMoveSpeed - normalSpeed;
|
||||||
|
CVector sparkDir = 0.25f*frictionSpeed;
|
||||||
|
CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[susp].point, sparkDir);
|
||||||
|
|
||||||
|
if(speedSq > 0.04f)
|
||||||
|
CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[susp].point, sparkDir);
|
||||||
|
if(speedSq > 0.16f){
|
||||||
|
CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[susp].point, sparkDir);
|
||||||
|
CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[susp].point, sparkDir);
|
||||||
|
}
|
||||||
|
}else if(m_aSuspensionSpringRatioPrev[i] < 1.0f &&
|
||||||
|
(fwdSpeed > 0.2f || m_aWheelState[i] == WHEEL_STATE_SPINNING)){
|
||||||
|
if(m_aWheelColPoints[susp].surfaceB == SURFACE_GRASS ||
|
||||||
|
m_aWheelColPoints[susp].surfaceB == SURFACE_MUD_DRY ||
|
||||||
|
m_aWheelColPoints[susp].surfaceB == SURFACE_SAND ||
|
||||||
|
m_aWheelColPoints[susp].surfaceB == SURFACE_SAND_BEACH)
|
||||||
|
AddWheelDirtAndWater(&m_aWheelColPoints[susp], drawParticles);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AddDamagedVehicleParticles();
|
||||||
|
//TODO(MIAMI): StoreShadowForVehicle once we have it
|
||||||
|
|
||||||
CMatrix mat;
|
CMatrix mat;
|
||||||
CVector pos;
|
CVector pos;
|
||||||
CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
|
|
||||||
CColModel *colModel = mi->GetColModel();
|
CColModel *colModel = mi->GetColModel();
|
||||||
|
|
||||||
// Wheel rotation
|
// Wheel rotation
|
||||||
|
@ -1362,7 +1669,58 @@ CBike::PreRender(void)
|
||||||
mat.UpdateRW();
|
mat.UpdateRW();
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: exhaust
|
// Exhaust smoke
|
||||||
|
if(bEngineOn && !(pHandling->Flags & HANDLING_NO_EXHAUST) && fwdSpeed < 130.0f){
|
||||||
|
CVector exhaustPos = mi->m_positions[CAR_POS_EXHAUST];
|
||||||
|
CVector pos1, pos2, dir;
|
||||||
|
|
||||||
|
if(exhaustPos != CVector(0.0f, 0.0f, 0.0f)){
|
||||||
|
dir.z = 0.0f;
|
||||||
|
if(fwdSpeed < 10.0f){
|
||||||
|
CVector steerFwd(-Sin(m_fSteerAngle), Cos(m_fSteerAngle), 0.0f);
|
||||||
|
steerFwd = Multiply3x3(GetMatrix(), steerFwd);
|
||||||
|
float r = CGeneral::GetRandomNumberInRange(-0.06f, -0.03f);
|
||||||
|
dir.x = steerFwd.x * r;
|
||||||
|
dir.y = steerFwd.y * r;
|
||||||
|
}else{
|
||||||
|
dir.x = m_vecMoveSpeed.x;
|
||||||
|
dir.y = m_vecMoveSpeed.y;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool dblExhaust = false;
|
||||||
|
pos1 = GetMatrix() * exhaustPos;
|
||||||
|
if(pHandling->Flags & HANDLING_DBL_EXHAUST){
|
||||||
|
dblExhaust = true;
|
||||||
|
pos2 = exhaustPos;
|
||||||
|
pos2.x = -pos2.x;
|
||||||
|
pos2 = GetMatrix() * pos2;
|
||||||
|
}
|
||||||
|
|
||||||
|
static float fumesLimit = 2.0f;
|
||||||
|
if(CGeneral::GetRandomNumberInRange(1.0f, 3.0f)*(m_fGasPedal+1.1f) > fumesLimit){
|
||||||
|
CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos1, dir);
|
||||||
|
if(dblExhaust)
|
||||||
|
CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos2, dir);
|
||||||
|
|
||||||
|
if(GetStatus() == STATUS_PLAYER && (CTimer::GetFrameCounter()&3) == 0 &&
|
||||||
|
CWeather::Rain == 0.0f){
|
||||||
|
CVector camDist = GetPosition() - TheCamera.GetPosition();
|
||||||
|
if(DotProduct(GetForward(), camDist) > 0.0f ||
|
||||||
|
TheCamera.GetLookDirection() == LOOKING_LEFT ||
|
||||||
|
TheCamera.GetLookDirection() == LOOKING_RIGHT){
|
||||||
|
if(dblExhaust)
|
||||||
|
pos1 = 0.5f*pos1 + 0.5f*pos2;
|
||||||
|
|
||||||
|
if(TheCamera.GetLookDirection() == LOOKING_LEFT ||
|
||||||
|
TheCamera.GetLookDirection() == LOOKING_RIGHT)
|
||||||
|
pos1 -= 0.2f*GetForward();
|
||||||
|
|
||||||
|
CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1636,7 +1994,83 @@ CBike::ProcessBuoyancy(void)
|
||||||
void
|
void
|
||||||
CBike::DoDriveByShootings(void)
|
CBike::DoDriveByShootings(void)
|
||||||
{
|
{
|
||||||
// TODO
|
CAnimBlendAssociation *anim;
|
||||||
|
CPlayerInfo* playerInfo = ((CPlayerPed*)this)->GetPlayerInfoForThisPlayerPed();
|
||||||
|
if (playerInfo && !playerInfo->m_bDriveByAllowed)
|
||||||
|
return;
|
||||||
|
|
||||||
|
CWeapon *weapon = pDriver->GetWeapon();
|
||||||
|
if(CWeaponInfo::GetWeaponInfo(weapon->m_eWeaponType)->m_nWeaponSlot != 5)
|
||||||
|
return;
|
||||||
|
|
||||||
|
weapon->Update(pDriver->m_audioEntityId, nil);
|
||||||
|
|
||||||
|
bool lookingLeft = false;
|
||||||
|
bool lookingRight = false;
|
||||||
|
if(TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN ||
|
||||||
|
TheCamera.m_bObbeCinematicCarCamOn){
|
||||||
|
if(CPad::GetPad(0)->GetLookLeft())
|
||||||
|
lookingLeft = true;
|
||||||
|
if(CPad::GetPad(0)->GetLookRight())
|
||||||
|
lookingRight = true;
|
||||||
|
}else{
|
||||||
|
if(TheCamera.Cams[TheCamera.ActiveCam].LookingLeft)
|
||||||
|
lookingLeft = true;
|
||||||
|
if(TheCamera.Cams[TheCamera.ActiveCam].LookingRight)
|
||||||
|
lookingRight = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(lookingLeft || lookingRight || CPad::GetPad(0)->GetCarGunFired()){
|
||||||
|
if(lookingLeft){
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_LHS);
|
||||||
|
if(anim)
|
||||||
|
anim->blendDelta = -1000.0f;
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_FT);
|
||||||
|
if(anim)
|
||||||
|
anim->blendDelta = -1000.0f;
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_RHS);
|
||||||
|
if(anim == nil || anim->blendDelta < 0.0f)
|
||||||
|
anim = CAnimManager::AddAnimation(pDriver->GetClump(), m_bikeAnimType, ANIM_BIKE_DRIVEBY_RHS);
|
||||||
|
}else if(lookingRight){
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_RHS);
|
||||||
|
if(anim)
|
||||||
|
anim->blendDelta = -1000.0f;
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_FT);
|
||||||
|
if(anim)
|
||||||
|
anim->blendDelta = -1000.0f;
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_LHS);
|
||||||
|
if(anim == nil || anim->blendDelta < 0.0f)
|
||||||
|
anim = CAnimManager::AddAnimation(pDriver->GetClump(), m_bikeAnimType, ANIM_BIKE_DRIVEBY_LHS);
|
||||||
|
}else{
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_LHS);
|
||||||
|
if(anim)
|
||||||
|
anim->blendDelta = -1000.0f;
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_RHS);
|
||||||
|
if(anim)
|
||||||
|
anim->blendDelta = -1000.0f;
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_FT);
|
||||||
|
if(anim == nil || anim->blendDelta < 0.0f)
|
||||||
|
anim = CAnimManager::AddAnimation(pDriver->GetClump(), m_bikeAnimType, ANIM_BIKE_DRIVEBY_FT);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!anim || !anim->IsRunning()) {
|
||||||
|
if (CPad::GetPad(0)->GetCarGunFired() && CTimer::GetTimeInMilliseconds() > weapon->m_nTimer) {
|
||||||
|
weapon->FireFromCar(this, lookingLeft, lookingRight);
|
||||||
|
weapon->m_nTimer = CTimer::GetTimeInMilliseconds() + 70;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
weapon->Reload();
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_RHS);
|
||||||
|
if(anim)
|
||||||
|
anim->blendDelta = -1000.0f;
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_LHS);
|
||||||
|
if(anim)
|
||||||
|
anim->blendDelta = -1000.0f;
|
||||||
|
anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_FT);
|
||||||
|
if(anim)
|
||||||
|
anim->blendDelta = -1000.0f;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1739,6 +2173,129 @@ CBike::VehicleDamage(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
CBike::AddDamagedVehicleParticles(void)
|
||||||
|
{
|
||||||
|
if(this == FindPlayerVehicle() && TheCamera.GetLookingForwardFirstPerson())
|
||||||
|
return;
|
||||||
|
if(this != FindPlayerVehicle() && (CTimer::GetFrameCounter() + m_randomSeed) & 1)
|
||||||
|
return;
|
||||||
|
if(m_fHealth >= 650.0f)
|
||||||
|
return;
|
||||||
|
|
||||||
|
CVector direction = 0.5f*m_vecMoveSpeed;
|
||||||
|
CVector damagePos = ((CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()))->GetFrontSeatPosn();
|
||||||
|
|
||||||
|
damagePos.z -= 0.4f;
|
||||||
|
damagePos = GetMatrix()*damagePos;
|
||||||
|
|
||||||
|
CalculateLeanMatrix();
|
||||||
|
|
||||||
|
if(m_fHealth < 250.0f){
|
||||||
|
// fire, done in processControl
|
||||||
|
}else if(m_fHealth < 320.0f){
|
||||||
|
direction *= 0.2f;
|
||||||
|
CParticle::AddParticle(PARTICLE_ENGINE_SMOKE2, damagePos, direction + 0.02f*m_leanMatrix.GetRight());
|
||||||
|
}else if(m_fHealth < 390.0f){
|
||||||
|
if(((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 0 ||
|
||||||
|
((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 2)
|
||||||
|
CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, direction + 0.05f*m_leanMatrix.GetRight());
|
||||||
|
direction *= 0.3f;
|
||||||
|
CParticle::AddParticle(PARTICLE_ENGINE_SMOKE, damagePos, direction + 0.04f*m_leanMatrix.GetRight());
|
||||||
|
}else if(m_fHealth < 460.0f){
|
||||||
|
int rnd = CTimer::GetFrameCounter() + m_randomSeed;
|
||||||
|
if(rnd < 10 ||
|
||||||
|
rnd < 70 && rnd > 25 ||
|
||||||
|
rnd < 160 && rnd > 100 ||
|
||||||
|
rnd < 200 && rnd > 175 ||
|
||||||
|
rnd > 235)
|
||||||
|
return;
|
||||||
|
direction.z += 0.05f;
|
||||||
|
if(TheCamera.GetLookDirection() != LOOKING_FORWARD){
|
||||||
|
CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, direction + 0.08f*m_leanMatrix.GetRight(), nil, 0.1f, 0, 0, 0, 1000);
|
||||||
|
}else if(((CTimer::GetFrameCounter() + m_randomSeed) & 1) == 0){
|
||||||
|
direction = 0.8f*m_vecMoveSpeed;
|
||||||
|
CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, direction + 0.07f*m_leanMatrix.GetRight(), nil, 0.1f, 0, 0, 0, 1000);
|
||||||
|
}
|
||||||
|
}else if(((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 0 ||
|
||||||
|
((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 2){
|
||||||
|
CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos + 0.06f*m_leanMatrix.GetRight(), direction);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int32
|
||||||
|
CBike::AddWheelDirtAndWater(CColPoint *colpoint, uint32 belowEffectSpeed)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
CVector dir;
|
||||||
|
static float minSize = 0.02f;
|
||||||
|
static float maxSize = 0.04f;
|
||||||
|
static RwRGBA grassCol = { 8, 24, 8, 255 };
|
||||||
|
static RwRGBA gravelCol = { 64, 64, 64, 255 };
|
||||||
|
static RwRGBA mudCol = { 64, 32, 16, 255 };
|
||||||
|
static RwRGBA sandCol = { 170, 165, 140, 255 };
|
||||||
|
static RwRGBA waterCol = { 48, 48, 64, 0 };
|
||||||
|
|
||||||
|
if(!belowEffectSpeed &&
|
||||||
|
colpoint->surfaceB != SURFACE_SAND && colpoint->surfaceB != SURFACE_SAND_BEACH)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
switch(colpoint->surfaceB){
|
||||||
|
case SURFACE_GRASS:
|
||||||
|
dir.x = -0.05f*m_vecMoveSpeed.x;
|
||||||
|
dir.y = -0.05f*m_vecMoveSpeed.y;
|
||||||
|
for(i = 0; i < 4; i++){
|
||||||
|
dir.z = CGeneral::GetRandomNumberInRange(0.03f, 0.04f);
|
||||||
|
CParticle::AddParticle(PARTICLE_WHEEL_DIRT, colpoint->point, dir, nil,
|
||||||
|
CGeneral::GetRandomNumberInRange(minSize, maxSize), grassCol);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
case SURFACE_GRAVEL:
|
||||||
|
dir.x = -0.05f*m_vecMoveSpeed.x;
|
||||||
|
dir.y = -0.05f*m_vecMoveSpeed.y;
|
||||||
|
for(i = 0; i < 4; i++){
|
||||||
|
dir.z = CGeneral::GetRandomNumberInRange(0.03f, 0.04f);
|
||||||
|
CParticle::AddParticle(PARTICLE_WHEEL_DIRT, colpoint->point, dir, nil,
|
||||||
|
CGeneral::GetRandomNumberInRange(minSize, maxSize), gravelCol);
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
case SURFACE_MUD_DRY:
|
||||||
|
dir.x = -0.05f*m_vecMoveSpeed.x;
|
||||||
|
dir.y = -0.05f*m_vecMoveSpeed.y;
|
||||||
|
for(i = 0; i < 4; i++){
|
||||||
|
dir.z = CGeneral::GetRandomNumberInRange(0.03f, 0.04f);
|
||||||
|
CParticle::AddParticle(PARTICLE_WHEEL_DIRT, colpoint->point, dir, nil,
|
||||||
|
CGeneral::GetRandomNumberInRange(minSize, maxSize), mudCol);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
case SURFACE_SAND:
|
||||||
|
case SURFACE_SAND_BEACH:
|
||||||
|
if(CTimer::GetFrameCounter() & 2)
|
||||||
|
return 0;
|
||||||
|
dir.x = 0.75f*m_vecMoveSpeed.x;
|
||||||
|
dir.y = 0.75f*m_vecMoveSpeed.y;
|
||||||
|
for(i = 0; i < 1; i++){
|
||||||
|
dir.z = CGeneral::GetRandomNumberInRange(0.02f, 0.055f);
|
||||||
|
CParticle::AddParticle(PARTICLE_SAND, colpoint->point, dir, nil,
|
||||||
|
0.8f*m_vecMoveSpeed.Magnitude(), sandCol);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
default:
|
||||||
|
if(CWeather::WetRoads > 0.01f){
|
||||||
|
CParticle::AddParticle(
|
||||||
|
PARTICLE_WATERSPRAY,
|
||||||
|
colpoint->point + CVector(0.0f, 0.0f, 0.25f+0.25f),
|
||||||
|
CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.005f, 0.04f)),
|
||||||
|
nil,
|
||||||
|
CGeneral::GetRandomNumberInRange(0.1f, 0.5f), waterCol);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
CBike::GetComponentWorldPosition(int32 component, CVector &pos)
|
CBike::GetComponentWorldPosition(int32 component, CVector &pos)
|
||||||
{
|
{
|
||||||
|
@ -1808,7 +2365,14 @@ CBike::BlowUpCar(CEntity *culprit)
|
||||||
if(!bCanBeDamaged)
|
if(!bCanBeDamaged)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// TODO: property damage stuff in FIX_BUGS
|
#ifdef FIX_BUGS
|
||||||
|
// taken from CAutomobile. maybe tweak values?
|
||||||
|
if(culprit == FindPlayerPed() || culprit == FindPlayerVehicle()){
|
||||||
|
CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel += 20;
|
||||||
|
CWorld::Players[CWorld::PlayerInFocus].m_fMediaAttention += 10.0f;
|
||||||
|
CStats::PropertyDestroyed += CGeneral::GetRandomNumber()%6000 + 4000;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// explosion pushes vehicle up
|
// explosion pushes vehicle up
|
||||||
m_vecMoveSpeed.z += 0.13f;
|
m_vecMoveSpeed.z += 0.13f;
|
||||||
|
@ -1833,10 +2397,28 @@ CBike::BlowUpCar(CEntity *culprit)
|
||||||
bool
|
bool
|
||||||
CBike::SetUpWheelColModel(CColModel *colModel)
|
CBike::SetUpWheelColModel(CColModel *colModel)
|
||||||
{
|
{
|
||||||
// TODO, but unused
|
RwMatrix *mat = RwMatrixCreate();
|
||||||
|
CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
|
||||||
|
CColModel *vehColModel = mi->GetColModel();
|
||||||
|
|
||||||
|
colModel->boundingSphere = vehColModel->boundingSphere;
|
||||||
|
colModel->boundingBox = vehColModel->boundingBox;
|
||||||
|
|
||||||
|
GetRelativeMatrix(mat, m_aBikeNodes[BIKE_WHEEL_FRONT], m_aBikeNodes[BIKE_CHASSIS]);
|
||||||
|
colModel->spheres[0].Set(0.5f*mi->m_wheelScale, *RwMatrixGetPos(mat), SURFACE_RUBBER, CAR_PIECE_WHEEL_LF);
|
||||||
|
GetRelativeMatrix(mat, m_aBikeNodes[BIKE_WHEEL_REAR], m_aBikeNodes[BIKE_CHASSIS]);
|
||||||
|
colModel->spheres[1].Set(0.5f*mi->m_wheelScale, *RwMatrixGetPos(mat), SURFACE_RUBBER, CAR_PIECE_WHEEL_LR);
|
||||||
|
colModel->numSpheres = 2;
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
RwMatrixDestroy(mat);
|
||||||
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float fBikeBurstForceMult = 0.02f;
|
||||||
|
float fBikeBurstFallSpeed = 0.3f;
|
||||||
|
float fBikeBurstFallSpeedPlayer = 0.55f;
|
||||||
|
|
||||||
void
|
void
|
||||||
CBike::BurstTyre(uint8 wheel, bool applyForces)
|
CBike::BurstTyre(uint8 wheel, bool applyForces)
|
||||||
{
|
{
|
||||||
|
@ -1853,8 +2435,7 @@ CBike::BurstTyre(uint8 wheel, bool applyForces)
|
||||||
#ifdef FIX_BUGS
|
#ifdef FIX_BUGS
|
||||||
CStats::TyresPopped++;
|
CStats::TyresPopped++;
|
||||||
#endif
|
#endif
|
||||||
// TODO(MIAMI)
|
DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_TYRE_POP, 0.0f);
|
||||||
// DMAudio.PlayOneShot(m_audioEntityId, SOUND_15, 0.0f);
|
|
||||||
|
|
||||||
if(GetStatus() == STATUS_SIMPLE){
|
if(GetStatus() == STATUS_SIMPLE){
|
||||||
SetStatus(STATUS_PHYSICS);
|
SetStatus(STATUS_PHYSICS);
|
||||||
|
@ -1865,7 +2446,26 @@ CBike::BurstTyre(uint8 wheel, bool applyForces)
|
||||||
ApplyMoveForce(GetRight() * m_fMass * CGeneral::GetRandomNumberInRange(-0.02f, 0.02f));
|
ApplyMoveForce(GetRight() * m_fMass * CGeneral::GetRandomNumberInRange(-0.02f, 0.02f));
|
||||||
ApplyTurnForce(GetRight() * m_fTurnMass * CGeneral::GetRandomNumberInRange(-0.02f, 0.02f), GetForward());
|
ApplyTurnForce(GetRight() * m_fTurnMass * CGeneral::GetRandomNumberInRange(-0.02f, 0.02f), GetForward());
|
||||||
}
|
}
|
||||||
// TODO: knock off driver
|
|
||||||
|
#ifdef FIX_SIGNIFICANT_BUGS
|
||||||
|
// This code checks piece types originally so it is never triggered
|
||||||
|
// as we have converted them to wheel indices above already.
|
||||||
|
if(pDriver){
|
||||||
|
if(wheel == BIKEWHEEL_FRONT && (m_aSuspensionSpringRatioPrev[BIKESUSP_F1] < 1.0f || m_aSuspensionSpringRatioPrev[BIKESUSP_F2] < 1.0f) ||
|
||||||
|
wheel == BIKEWHEEL_REAR && (m_aSuspensionSpringRatioPrev[BIKESUSP_R1] < 1.0f || m_aSuspensionSpringRatioPrev[BIKESUSP_R2] < 1.0f)){
|
||||||
|
float speedSq = m_vecMoveSpeed.MagnitudeSqr();
|
||||||
|
if(speedSq > fBikeBurstFallSpeed &&
|
||||||
|
(GetStatus() != STATUS_PLAYER || speedSq > fBikeBurstFallSpeedPlayer)){
|
||||||
|
if(wheel == BIKEWHEEL_FRONT){
|
||||||
|
KnockOffRider(WEAPONTYPE_RAMMEDBYCAR, 0, pDriver, false);
|
||||||
|
if(pPassengers[0])
|
||||||
|
KnockOffRider(WEAPONTYPE_RAMMEDBYCAR, 0, pPassengers[0], false);
|
||||||
|
}else
|
||||||
|
ApplyTurnForce(2.0f*fBikeBurstForceMult*m_fTurnMass*GetRight(), GetForward());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2174,20 +2774,6 @@ CBike::ResetSuspension(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: maybe put this somewhere else
|
|
||||||
inline void
|
|
||||||
GetRelativeMatrix(RwMatrix *mat, RwFrame *frm, RwFrame *end)
|
|
||||||
{
|
|
||||||
*mat = *RwFrameGetMatrix(frm);
|
|
||||||
frm = RwFrameGetParent(frm);
|
|
||||||
while(frm){
|
|
||||||
RwMatrixTransform(mat, RwFrameGetMatrix(frm), rwCOMBINEPOSTCONCAT);
|
|
||||||
frm = RwFrameGetParent(frm);
|
|
||||||
if(frm == end)
|
|
||||||
frm = nil;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
CBike::SetupSuspensionLines(void)
|
CBike::SetupSuspensionLines(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -69,11 +69,11 @@ public:
|
||||||
uint8 m_bike_flag01 : 1;
|
uint8 m_bike_flag01 : 1;
|
||||||
uint8 m_bike_flag02 : 1;
|
uint8 m_bike_flag02 : 1;
|
||||||
uint8 bWaterTight : 1;
|
uint8 bWaterTight : 1;
|
||||||
uint8 m_bike_flag08 : 1;
|
uint8 bIsBeingPickedUp : 1;
|
||||||
uint8 bIsStanding : 1;
|
uint8 bIsStanding : 1;
|
||||||
uint8 bExtraSpeed : 1; // leaning forward
|
uint8 bExtraSpeed : 1; // leaning forward
|
||||||
uint8 bIsOnFire : 1;
|
uint8 bIsOnFire : 1;
|
||||||
uint8 m_bike_flag80 : 1; // doing wheelie?
|
uint8 m_bike_flag80 : 1;
|
||||||
int16 m_doingBurnout;
|
int16 m_doingBurnout;
|
||||||
float m_fTireTemperature;
|
float m_fTireTemperature;
|
||||||
float m_fBrakeDestabilization;
|
float m_fBrakeDestabilization;
|
||||||
|
@ -121,6 +121,8 @@ public:
|
||||||
void VehicleDamage(void);
|
void VehicleDamage(void);
|
||||||
void ProcessBuoyancy(void);
|
void ProcessBuoyancy(void);
|
||||||
void DoDriveByShootings(void);
|
void DoDriveByShootings(void);
|
||||||
|
void AddDamagedVehicleParticles(void);
|
||||||
|
int32 AddWheelDirtAndWater(CColPoint *colpoint, uint32 belowEffectSpeed);
|
||||||
void PlayHornIfNecessary(void);
|
void PlayHornIfNecessary(void);
|
||||||
void ResetSuspension(void);
|
void ResetSuspension(void);
|
||||||
void SetupSuspensionLines(void);
|
void SetupSuspensionLines(void);
|
||||||
|
|
|
@ -975,7 +975,7 @@ CBoat::DoDriveByShootings(void)
|
||||||
|
|
||||||
if (!anim || !anim->IsRunning()) {
|
if (!anim || !anim->IsRunning()) {
|
||||||
if (CPad::GetPad(0)->GetCarGunFired() && CTimer::GetTimeInMilliseconds() > weapon->m_nTimer) {
|
if (CPad::GetPad(0)->GetCarGunFired() && CTimer::GetTimeInMilliseconds() > weapon->m_nTimer) {
|
||||||
weapon->FireFromCar(this, lookingLeft);
|
weapon->FireFromCar(this, lookingLeft, true);
|
||||||
weapon->m_nTimer = CTimer::GetTimeInMilliseconds() + 70;
|
weapon->m_nTimer = CTimer::GetTimeInMilliseconds() + 70;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -748,7 +748,7 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon
|
||||||
static bool bBraking;
|
static bool bBraking;
|
||||||
static bool bDriving;
|
static bool bDriving;
|
||||||
|
|
||||||
#ifdef FIX_BUGS
|
#ifdef FIX_SIGNIFICANT_BUGS
|
||||||
bAlreadySkidding = false;
|
bAlreadySkidding = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -903,7 +903,7 @@ CVehicle::ProcessBikeWheel(CVector &wheelFwd, CVector &wheelRight, CVector &whee
|
||||||
static bool bDriving;
|
static bool bDriving;
|
||||||
static bool bReversing;
|
static bool bReversing;
|
||||||
|
|
||||||
#ifdef FIX_BUGS
|
#ifdef FIX_SIGNIFICANT_BUGS
|
||||||
bAlreadySkidding = false;
|
bAlreadySkidding = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1032,7 +1032,6 @@ CVehicle::ProcessBikeWheel(CVector &wheelFwd, CVector &wheelRight, CVector &whee
|
||||||
float impulse = speed*m_fMass;
|
float impulse = speed*m_fMass;
|
||||||
float turnImpulse = speed*GetMass(wheelContactPoint, direction);
|
float turnImpulse = speed*GetMass(wheelContactPoint, direction);
|
||||||
CVector vTurnImpulse = turnImpulse * direction;
|
CVector vTurnImpulse = turnImpulse * direction;
|
||||||
|
|
||||||
ApplyMoveForce(impulse * direction);
|
ApplyMoveForce(impulse * direction);
|
||||||
|
|
||||||
float turnRight = DotProduct(vTurnImpulse, GetRight());
|
float turnRight = DotProduct(vTurnImpulse, GetRight());
|
||||||
|
|
|
@ -387,7 +387,7 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
CWeapon::FireFromCar(CVehicle *shooter, bool left)
|
CWeapon::FireFromCar(CVehicle *shooter, bool left, bool right)
|
||||||
{
|
{
|
||||||
ASSERT(shooter!=nil);
|
ASSERT(shooter!=nil);
|
||||||
|
|
||||||
|
@ -397,7 +397,7 @@ CWeapon::FireFromCar(CVehicle *shooter, bool left)
|
||||||
if ( m_nAmmoInClip <= 0 )
|
if ( m_nAmmoInClip <= 0 )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if ( FireInstantHitFromCar(shooter, left) )
|
if ( FireInstantHitFromCar(shooter, left, right) )
|
||||||
{
|
{
|
||||||
DMAudio.PlayOneShot(shooter->m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
|
DMAudio.PlayOneShot(shooter->m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
|
||||||
|
|
||||||
|
@ -2021,8 +2021,9 @@ CWeapon::FireM16_1stPerson(CEntity *shooter)
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
CWeapon::FireInstantHitFromCar(CVehicle *shooter, bool left)
|
CWeapon::FireInstantHitFromCar(CVehicle *shooter, bool left, bool right)
|
||||||
{
|
{
|
||||||
|
// TODO(MIAMI): bikes
|
||||||
CWeaponInfo *info = GetInfo();
|
CWeaponInfo *info = GetInfo();
|
||||||
|
|
||||||
CVehicleModelInfo *modelInfo = shooter->GetModelInfo();
|
CVehicleModelInfo *modelInfo = shooter->GetModelInfo();
|
||||||
|
|
|
@ -37,7 +37,7 @@ public:
|
||||||
void Shutdown();
|
void Shutdown();
|
||||||
|
|
||||||
bool Fire (CEntity *shooter, CVector *fireSource);
|
bool Fire (CEntity *shooter, CVector *fireSource);
|
||||||
bool FireFromCar (CVehicle *shooter, bool left);
|
bool FireFromCar (CVehicle *shooter, bool left, bool right);
|
||||||
bool FireMelee (CEntity *shooter, CVector &fireSource);
|
bool FireMelee (CEntity *shooter, CVector &fireSource);
|
||||||
bool FireInstantHit(CEntity *shooter, CVector *fireSource);
|
bool FireInstantHit(CEntity *shooter, CVector *fireSource);
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ public:
|
||||||
bool FireAreaEffect (CEntity *shooter, CVector *fireSource);
|
bool FireAreaEffect (CEntity *shooter, CVector *fireSource);
|
||||||
bool FireSniper (CEntity *shooter);
|
bool FireSniper (CEntity *shooter);
|
||||||
bool FireM16_1stPerson (CEntity *shooter);
|
bool FireM16_1stPerson (CEntity *shooter);
|
||||||
bool FireInstantHitFromCar(CVehicle *shooter, bool left);
|
bool FireInstantHitFromCar(CVehicle *shooter, bool left, bool right);
|
||||||
|
|
||||||
static void DoDoomAiming (CEntity *shooter, CVector *source, CVector *target);
|
static void DoDoomAiming (CEntity *shooter, CVector *source, CVector *target);
|
||||||
static void DoTankDoomAiming (CEntity *shooter, CEntity *driver, CVector *source, CVector *target);
|
static void DoTankDoomAiming (CEntity *shooter, CEntity *driver, CVector *source, CVector *target);
|
||||||
|
|
Loading…
Reference in a new issue