From 4c55da2d78e55258d7428562df626f1df7272522 Mon Sep 17 00:00:00 2001 From: Bronzehawk75 Date: Sun, 11 Feb 2024 19:58:51 -0500 Subject: [PATCH] Added fail safe in case there's no landing target set --- sp/src/game/server/hl2/npc_combinedropship.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sp/src/game/server/hl2/npc_combinedropship.cpp b/sp/src/game/server/hl2/npc_combinedropship.cpp index 1716cef5..07863928 100644 --- a/sp/src/game/server/hl2/npc_combinedropship.cpp +++ b/sp/src/game/server/hl2/npc_combinedropship.cpp @@ -1841,16 +1841,23 @@ void CNPC_CombineDropship::InputDropMines( inputdata_t &inputdata ) //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void CNPC_CombineDropship::InputDropStrider( inputdata_t &inputdata ) +void CNPC_CombineDropship::InputDropStrider(inputdata_t& inputdata) { - if ( !m_hContainer || !FClassnameIs( m_hContainer, "npc_strider" ) ) + if (!m_hContainer || !FClassnameIs(m_hContainer, "npc_strider")) { - Warning("npc_combinedropship %s was told to drop Strider, but isn't carrying one!\n", STRING(GetEntityName()) ); + Warning("npc_combinedropship %s was told to drop Strider, but isn't carrying one!\n", STRING(GetEntityName())); return; } #ifdef MAPBASE - LandCommon(); + if (m_iszLandTarget != NULL_STRING) + { + LandCommon(); + } + else + { + SetLandingState(LANDING_STRIDER); + } #else QAngle angles = GetAbsAngles();