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

prop_vehicle_driveable: respect clipvehicle

Browse source
This commit is contained in:
Marco Cawthorne 2022-06-16 23:04:26 -07:00
parent 241c94368f
commit c996986631
Signed by: eukara
GPG key ID: CE2032F0A2882A22
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -471,9 +471,9 @@ prop_vehicle_driveable_wheel::Physics(float turnrate, float flTimeLength)
void void
prop_vehicle_driveable_wheel::prop_vehicle_driveable_wheel(void) prop_vehicle_driveable_wheel::prop_vehicle_driveable_wheel(void)
{ {
hitcontentsmaski = CONTENTBIT_SOLID | CONTENTBIT_BODY;
mins = [-8,-8,-35]; mins = [-8,-8,-35];
maxs = [8,8,8]; maxs = [8,8,8];
hitcontentsmaski = CONTENTBIT_BODY | CONTENTBITS_POINTSOLID | CONTENTBIT_VEHICLECLIP;
} }
#ifdef CLIENT #ifdef CLIENT
@ -873,6 +873,7 @@ prop_vehicle_driveable::prop_vehicle_driveable(void)
m_flStraightenFactor = 1.0f; m_flStraightenFactor = 1.0f;
m_vecGravityDir = [0,0,-1]; m_vecGravityDir = [0,0,-1];
m_iVehicleFlags |= VHF_FROZEN; m_iVehicleFlags |= VHF_FROZEN;
hitcontentsmaski = CONTENTBIT_BODY | CONTENTBITS_POINTSOLID | CONTENTBIT_VEHICLECLIP;
if (!m_eCollBox1) if (!m_eCollBox1)
m_eCollBox1 = spawn(NSEntity); m_eCollBox1 = spawn(NSEntity);
@ -884,6 +885,9 @@ prop_vehicle_driveable::prop_vehicle_driveable(void)
m_eCollBox2.SetSize([-32,-32,0], [32,32,32]); m_eCollBox2.SetSize([-32,-32,0], [32,32,32]);
} }
m_eCollBox1.hitcontentsmaski = hitcontentsmaski;
m_eCollBox2.hitcontentsmaski = hitcontentsmaski;
if (!m_wlFL) if (!m_wlFL)
m_wlFL = spawn(prop_vehicle_driveable_wheel); m_wlFL = spawn(prop_vehicle_driveable_wheel);
if (!m_wlFR) if (!m_wlFR)

2
src/shared/materials.h
View file

@ -182,7 +182,7 @@ const int CONTENTBIT_UNUSED7 = 0x00000800i
const int CONTENTBIT_UNUSED8 = 0x00001000i; const int CONTENTBIT_UNUSED8 = 0x00001000i;
const int CONTENTBIT_UNUSED9 = 0x00002000i; const int CONTENTBIT_UNUSED9 = 0x00002000i;
const int CONTENTBIT_FTELADDER = 0x00004000i; /* surfaceparm climb */ const int CONTENTBIT_FTELADDER = 0x00004000i; /* surfaceparm climb */
const int CONTENTBIT_UNUSED10 = 0x00008000i; const int CONTENTBIT_VEHICLECLIP = 0x00008000i;
const int CONTENTBIT_PLAYERCLIP = 0x00010000i; const int CONTENTBIT_PLAYERCLIP = 0x00010000i;
/* surfaceParm playerclip */ /* surfaceParm playerclip */