fix(welder): extract FinishWeld routine and always reset weld direction on finish

BaseItemPostFrame would always call WeldDoor otherwise

Author: anf3is

src/game/shared/swarm/asw_weapon_welder_shared.cpp

@@ -203,19 +203,7 @@ void CASW_Weapon_Welder::WeldDoor(bool bSeal)
 
 	if ( !bWelding )
 	{
-		m_iAutomaticWeldDirection = 0;
-		m_bShotDelayed = false;
-#ifdef GAME_DLL
-		if ( pMarine->GetMarineResource() )
-		{
-			pMarine->GetMarineResource()->m_hWeldingDoor = NULL;
-		}
-
-		m_pWeldDoor = NULL;
-
-		pMarine->OnWeldFinished();
-#endif
-		m_bIsFiring = false;
+		FinishWeld( pMarine, false );
 	}
 	else
 	{
@@ -230,29 +218,37 @@ void CASW_Weapon_Welder::WeldDoor(bool bSeal)
 	}
 }
 
+void CASW_Weapon_Welder::FinishWeld( CASW_Marine* pMarine, bool bKeepWeldDirection )
+{
+	if ( !bKeepWeldDirection )
+		m_iAutomaticWeldDirection = 0;
+	m_bShotDelayed = false;
+#ifdef GAME_DLL
+	if ( pMarine )
+	{
+		if ( pMarine->GetMarineResource() )
+		{
+			pMarine->GetMarineResource()->m_hWeldingDoor = NULL;
+		}
+		pMarine->OnWeldFinished();
+	}
+	m_pWeldDoor = NULL;
+#endif
+	m_bIsFiring = false;
+}
+
 // make the weapon weld if needed
 
 void CASW_Weapon_Welder::ItemPostFrame()
 {
+	CASW_Marine *pMarine = NULL;
 #ifndef CLIENT_DLL
-	CASW_Marine *pMarine = GetMarine();
+	pMarine = GetMarine();
 	if ( !pMarine || !pMarine->GetCommander() )
 	{
 		if ( m_bPlayingWelderSound )
 		{
-			m_bIsFiring = false;
-
-			m_pWeldDoor = NULL;
-
-			if (pMarine)
-			{
-				if (pMarine->GetMarineResource())
-				{
-					pMarine->GetMarineResource()->m_hWeldingDoor = NULL;
-				}
-
-				pMarine->OnWeldFinished();
-			}
+			FinishWeld( pMarine, true );
 			//Msg( "Clearing weld door as no marine\n" );
 		}
 		return BaseItemPostFrame();
@@ -317,33 +313,14 @@ void CASW_Weapon_Welder::ItemPostFrame()
 			if ( ( m_iAutomaticWeldDirection > 0 && m_pWeldDoor->GetSealAmount() >= 1.0f ) ||
 				 ( m_iAutomaticWeldDirection < 0 && m_pWeldDoor->GetSealAmount() <= 0.0f ) )
 			{
-				m_iAutomaticWeldDirection = 0;
-				m_bShotDelayed = false;
-#ifdef GAME_DLL
-				if ( pMarine->GetMarineResource() )
-				{
-					pMarine->GetMarineResource()->m_hWeldingDoor = NULL;
-				}
-				m_pWeldDoor = NULL;
-				pMarine->OnWeldFinished();
-#endif
-				m_bIsFiring = false;
+				FinishWeld( pMarine, false );
 			}
 		}
 		else
 		{
 			if ( !FindDoor() )
 			{
-				m_bShotDelayed = false;
-#ifdef GAME_DLL
-				if ( pMarine->GetMarineResource() )
-				{
-					pMarine->GetMarineResource()->m_hWeldingDoor = NULL;
-				}
-				m_pWeldDoor = NULL;
-				pMarine->OnWeldFinished();
-#endif
-				m_bIsFiring = false;
+				FinishWeld( pMarine, true );
 			}
 		}
 	}

src/game/shared/swarm/asw_weapon_welder_shared.h

@@ -5,6 +5,7 @@
 #ifdef CLIENT_DLL
 	#define CASW_Weapon_Welder C_ASW_Weapon_Welder
 	#define CASW_Weapon C_ASW_Weapon
+	#define CASW_Marine C_ASW_Marine
 	#include "c_asw_weapon.h"
 #else
 	#include "asw_weapon.h"
@@ -29,6 +30,7 @@ class CASW_Weapon_Welder : public CASW_Weapon
 	virtual void PrimaryAttack();
 	virtual void SecondaryAttack();
 	virtual void WeldDoor(bool bSeal);
+	virtual void FinishWeld( CASW_Marine* pMarine, bool bKeepWeldDirection = false );
 
 	#ifndef CLIENT_DLL
 		DECLARE_DATADESC();