vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

prop_vehicle_driveable: Add WeaponInput() method to make this a bit cleaner for sub-classes.

Browse source
This commit is contained in:
Marco Cawthorne 2022-04-13 15:31:46 -07:00
parent 1b2f587599
commit 00e8f8e7a9
Signed by: eukara
GPG key ID: C196CD8BA993248A
1 changed files with 46 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/gs-entbase/shared/prop_vehicle_driveable.qc
View file

@ -102,6 +102,7 @@ class prop_vehicle_driveable:NSVehicle
virtual void(void) Physics; virtual void(void) Physics;
virtual void(void) RunVehiclePhysics; virtual void(void) RunVehiclePhysics;
virtual void(void) WeaponInput;
virtual void(void) PlayerInput; virtual void(void) PlayerInput;
virtual void(void) OnRemoveEntity; virtual void(void) OnRemoveEntity;
@ -208,7 +209,18 @@ prop_vehicle_driveable_wheel::Bounce(vector normal)
{ {
prop_vehicle_driveable vehParent; prop_vehicle_driveable vehParent;
vehParent = (prop_vehicle_driveable)owner; vehParent = (prop_vehicle_driveable)owner;
velocity -= (velocity * normal) * normal * vehParent.m_flBounceFactor;
vector vecBounce = (velocity * normal) * normal * vehParent.m_flBounceFactor;
velocity -= vecBounce;
vehParent.velocity = velocity;
#ifdef SERVER
float flStregth = vlen((velocity * normal) * normal);
if (flStregth > 96) {
Sound_Play(vehParent, CHAN_VOICE, "prop_vehicle_driveable.bounce");
}
#endif
} }
void void
@ -385,6 +397,22 @@ prop_vehicle_driveable_wheel::Accel(float flMoveTime, float m_flTurn)
/* apply gravity */ /* apply gravity */
velocity += vehParent.m_vecGravityDir * flMoveTime * serverkeyfloat("phy_gravity") * trace_fraction; velocity += vehParent.m_vecGravityDir * flMoveTime * serverkeyfloat("phy_gravity") * trace_fraction;
tracebox(origin, mins * 4.0, maxs * 4.0, origin, MOVE_NORMAL, owner);
if (trace_ent && trace_ent != vehParent.m_eDriver) {
int iImpactDamage = vlen(velocity) / 100;
if (iImpactDamage > 10) {
trace_ent.velocity = velocity;
velocity *= 0.25f;
#ifdef SERVER
if (trace_ent.takedamage) {
NSSurfacePropEntity foo = (NSSurfacePropEntity)trace_ent;
Damage_Apply(foo, vehParent.m_eDriver, iImpactDamage, 0, DMG_VEHICLE);
}
#endif
}
}
} }
void void
@ -414,7 +442,7 @@ prop_vehicle_driveable_wheel::Physics(float turnrate, float flTimeLength)
/* try to correct the wheel's position, in case it got stuck */ /* try to correct the wheel's position, in case it got stuck */
owner_pos = owner.origin + (owner.mins + owner.maxs) * 0.5f; owner_pos = owner.origin + (owner.mins + owner.maxs) * 0.5f;
tracebox(owner_pos, mins, maxs, origin, MOVE_NOMONSTERS, owner); tracebox(owner_pos, mins, maxs, origin, MOVE_NORMAL, owner);
setorigin(this, trace_endpos); setorigin(this, trace_endpos);
/* see if we're in-air */ /* see if we're in-air */
@ -480,6 +508,12 @@ prop_vehicle_driveable::PredictPostFrame(void)
} }
#endif #endif
void
prop_vehicle_driveable::WeaponInput(void)
{
}
void void
prop_vehicle_driveable::PlayerInput(void) prop_vehicle_driveable::PlayerInput(void)
{ {
@ -490,9 +524,6 @@ prop_vehicle_driveable::PlayerInput(void)
/* prediction frame... */ /* prediction frame... */
RunVehiclePhysics(); RunVehiclePhysics();
/* only allow use key */
input_buttons = (input_buttons & INPUT_BUTTON5);
#ifdef SERVER #ifdef SERVER
/* allow us to exit */ /* allow us to exit */
if (m_flUseTime < time) { if (m_flUseTime < time) {
@ -503,6 +534,11 @@ prop_vehicle_driveable::PlayerInput(void)
} }
} }
#endif #endif
WeaponInput();
/* only allow use key */
input_buttons = (input_buttons & INPUT_BUTTON5);
} }
void void
@ -811,11 +847,14 @@ prop_vehicle_driveable::SendEntity(entity ePVSent, float flSendFlags)
void void
prop_vehicle_driveable::prop_vehicle_driveable(void) prop_vehicle_driveable::prop_vehicle_driveable(void)
{ {
#ifdef SERVER
Sound_Precache("prop_vehicle_driveable.bounce");
#endif
m_eDriver = __NULL__; m_eDriver = __NULL__;
m_flBounceFactor = 1.5f; m_flBounceFactor = 1.25f;
m_flAcceleration = 600.0f; m_flAcceleration = 600.0f;
m_flSkidSpeed = 256.0f; m_flSkidSpeed = 256.0f;
m_flTraction = 4.0f; m_flTraction = 5.0f;
m_flBreakFactor = 2.0f; m_flBreakFactor = 2.0f;
m_flSteerFactor = 1.0f; m_flSteerFactor = 1.0f;
m_flStraightenFactor = 1.0f; m_flStraightenFactor = 1.0f;