Mirrors/halflife2chaos
1
0
Fork 0
mirror of https://github.com/Pinsplash/halflife2chaos.git synced 2024-10-29 23:32:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

crane transition fixes

Browse Source 
fixed crashing when the crane_tip is missing
crane_tip is now recreated when a crane is transitioned to a new map, because the crane_tip isn't brought over
This commit is contained in:
Pinsplash 2023-05-24 02:43:29 -05:00
parent cbbed0f770
commit 4c93f4c96b
3 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -88,7 +88,7 @@ These settings have been put in their own CFG files so you can control what they
* `portalsopenall.cfg`: Sets `r_portalsopenall`. Force-opens all areaportals. Most users will want to use 1 because if 0, areas of levels may become invisible until you enter them. This was intended to help performance, but Chaos can disrupt this feature due to sequence breaking. Normally the default is 0, but in Chaos, it's 1.
## Known issues
* Many people have been having an issue where their binds are incorrect. Check them in the keyboard menu before playing.
* Many people have been having an issue where their key binds are incorrect. Check them in the keyboard menu before playing.
* To ensure all effects work right, sv_cheats is automatically set to 1. Don't change it.
* Sometimes the bar at the top won't appear after loading a save/map. The mod is still working. The bar should appear once the next effect starts.
* The "Saved..." message may not appear. The save is still made. (As long as you pressed the right button. See first note.)
@ -98,6 +98,7 @@ These settings have been put in their own CFG files so you can control what they
* **Didn't Skip Arm Day** sometimes makes it harder to grab things.
* Sometimes things are invisible with **Orthographic Camera**. Turning on the flashlight may fix it.
* Collisions can be weird when **Slow Physics** is on.
* **Teleporter Bullets** does not apply to vehicle guns while a fix is in the works for a serious issue.
## Thanks for big and small bits of help
* Blixibon

88
sp/src/game/server/hl2/vehicle_crane.cpp
View File

@ -159,48 +159,46 @@ void CPropCrane::Spawn( void )
void CPropCrane::Activate( void )
{
BaseClass::Activate();
// If we load a game, we don't need to set this all up again.
if ( m_hCraneMagnet )
return;
// Find our magnet
if ( m_iszMagnetName == NULL_STRING )
if (!m_hCraneTip)//we may have lost our crane tip by transitioning to a new map
{
Warning( "prop_vehicle_crane %s has no magnet entity specified!\n", STRING(GetEntityName()) );
UTIL_Remove( this );
return;
}
// Find our magnet
if (m_iszMagnetName == NULL_STRING)
{
Warning("prop_vehicle_crane %s has no magnet entity specified!\n", STRING(GetEntityName()));
UTIL_Remove(this);
return;
}
m_hCraneMagnet = dynamic_cast<CPhysMagnet *>(gEntList.FindEntityByName( NULL, STRING(m_iszMagnetName) ));
if ( !m_hCraneMagnet )
{
Warning( "prop_vehicle_crane %s failed to find magnet %s.\n", STRING(GetEntityName()), STRING(m_iszMagnetName) );
UTIL_Remove( this );
return;
m_hCraneMagnet = dynamic_cast<CPhysMagnet *>(gEntList.FindEntityByName(NULL, STRING(m_iszMagnetName)));
if (!m_hCraneMagnet)
{
Warning("prop_vehicle_crane %s failed to find magnet %s.\n", STRING(GetEntityName()), STRING(m_iszMagnetName));
UTIL_Remove(this);
return;
}
// Create our constraint group
constraint_groupparams_t group;
group.Defaults();
m_pConstraintGroup = physenv->CreateConstraintGroup(group);
m_hCraneMagnet->SetConstraintGroup(m_pConstraintGroup);
Vector vecOrigin;
QAngle vecAngles;
GetCraneTipPosition(&vecOrigin, &vecAngles);
m_hCraneTip = CCraneTip::Create(m_hCraneMagnet, m_pConstraintGroup, vecOrigin, vecAngles);
if (!m_hCraneTip)
{
UTIL_Remove(this);
return;
}
m_pConstraintGroup->Activate();
}
// We want the magnet to cast a long shadow
m_hCraneMagnet->SetShadowCastDistance( 2048 );
// Create our constraint group
constraint_groupparams_t group;
group.Defaults();
m_pConstraintGroup = physenv->CreateConstraintGroup( group );
m_hCraneMagnet->SetConstraintGroup( m_pConstraintGroup );
// Create our crane tip
Vector vecOrigin;
QAngle vecAngles;
GetCraneTipPosition( &vecOrigin, &vecAngles );
m_hCraneTip = CCraneTip::Create( m_hCraneMagnet, m_pConstraintGroup, vecOrigin, vecAngles );
if ( !m_hCraneTip )
{
UTIL_Remove( this );
return;
}
m_pConstraintGroup->Activate();
// Make a rope to connect 'em
int iIndex = m_hCraneMagnet->LookupAttachment("magnetcable_a");
m_hRope = CRopeKeyframe::Create( this, m_hCraneMagnet, 1, iIndex );
@ -412,8 +410,8 @@ void CPropCrane::DrawDebugGeometryOverlays(void)
{
m_hCraneMagnet->GetAttachment( iIndex, vecPoint );
}
NDebugOverlay::Line( m_hCraneTip->GetAbsOrigin(), vecPoint, 255,255,255, true, 0.1 );
if (m_hCraneTip)
NDebugOverlay::Line( m_hCraneTip->GetAbsOrigin(), vecPoint, 255,255,255, true, 0.1 );
}
BaseClass::DrawDebugGeometryOverlays();
@ -610,7 +608,8 @@ void CPropCrane::DriveCrane( int iDriverButtons, int iButtonsPressed, float flNP
// Drop the magnet till it hits something
m_bDropping = true;
m_hCraneMagnet->ResetHasHitSomething();
m_hCraneTip->m_pSpring->SetSpringConstant( CRANE_SPRING_CONSTANT_LOWERING );
if (m_hCraneTip)
m_hCraneTip->m_pSpring->SetSpringConstant( CRANE_SPRING_CONSTANT_LOWERING );
m_ServerVehicle.PlaySound( VS_MISC1 );
}
@ -643,6 +642,8 @@ void CPropCrane::DriveCrane( int iDriverButtons, int iButtonsPressed, float flNP
//-----------------------------------------------------------------------------
void CPropCrane::RecalculateCraneTip( void )
{
if (!m_hCraneTip)
return;
Vector vecOrigin;
QAngle vecAngles;
GetCraneTipPosition( &vecOrigin, &vecAngles );
@ -677,7 +678,8 @@ void CPropCrane::RunCraneMovement( float flTime )
if ( m_hCraneMagnet->HasHitSomething() )
{
// We hit the ground, stop dropping
m_hCraneTip->m_pSpring->SetSpringConstant( CRANE_SPRING_CONSTANT_INITIAL_RAISING );
if (m_hCraneTip)
m_hCraneTip->m_pSpring->SetSpringConstant( CRANE_SPRING_CONSTANT_INITIAL_RAISING );
m_bDropping = false;
m_flNextDropAllowedTime = gpGlobals->curtime + 3.0;
m_flSlowRaiseTime = gpGlobals->curtime;
@ -691,7 +693,8 @@ void CPropCrane::RunCraneMovement( float flTime )
flDelta = clamp( flDelta, 0, CRANE_SLOWRAISE_TIME );
float flCurrentSpringConstant = RemapVal( flDelta, 0, CRANE_SLOWRAISE_TIME, CRANE_SPRING_CONSTANT_INITIAL_RAISING, CRANE_SPRING_CONSTANT_HANGING );
m_hCraneTip->m_pSpring->SetSpringConstant( flCurrentSpringConstant );
if (m_hCraneTip)
m_hCraneTip->m_pSpring->SetSpringConstant( flCurrentSpringConstant );
}
// If we've moved in any way, update the tip
@ -784,7 +787,10 @@ void CPropCrane::TurnMagnetOff( void )
//-----------------------------------------------------------------------------
const Vector &CPropCrane::GetCraneTipPosition( void )
{
return m_hCraneTip->GetAbsOrigin();
if (m_hCraneTip)
return m_hCraneTip->GetAbsOrigin();
else
return vec3_origin;
}
//-----------------------------------------------------------------------------

2
sp/src/game/server/hl2/vehicle_crane.h
View File

@ -61,7 +61,7 @@ public:
physenv->DestroySpring( m_pSpring );
}
}
virtual int ObjectCaps(void) { return BaseClass::ObjectCaps() | FCAP_ACROSS_TRANSITION; };
void Spawn( void );
void Precache( void );