Merge branch 'ReactiveDrop:reactivedrop_beta' into cvars_0

Kitsune44 · web-flow · commit 1cd0da0164ff · 2026-05-09T13:00:38.000+02:00
diff --git a/src/game/client/swarm/asw_view_scene.cpp b/src/game/client/swarm/asw_view_scene.cpp
@@ -566,7 +566,7 @@ void CASWNightVisionSelfIllumProxy::OnBind( void *pC_BaseEntity )
 EXPOSE_MATERIAL_PROXY( CASWNightVisionSelfIllumProxy, NightVisionSelfIllum );
 
 
-void CASWViewRender::PerformNightVisionEffect( const CViewSetup &view )
+void CASWViewRender::PerformNightVisionEffect( const CViewSetup &setup )
 {
 	C_ASW_Player *pPlayer = C_ASW_Player::GetLocalASWPlayer();
 	if ( !pPlayer )
@@ -587,7 +587,7 @@ void CASWViewRender::PerformNightVisionEffect( const CViewSetup &view )
 		{
 			byte overlaycolor[4] = { 0, 255, 0, 255 };
 
-			UpdateScreenEffectTexture( 0, view.x, view.y, view.width, view.height );
+			UpdateScreenEffectTexture( 0, setup.x, setup.y, setup.width, setup.height );
 
 			overlaycolor[3] = flVisionAlpha;
 
diff --git a/src/game/client/swarm/c_asw_aoegrenade_projectile.cpp b/src/game/client/swarm/c_asw_aoegrenade_projectile.cpp
@@ -204,11 +204,11 @@ void C_ASW_AOEGrenade_Projectile::UpdateTargetAOEEffects( void )
 		{
 			bool bHaveEffect = false;
 
-			for ( AOEGrenTargetFXList_t::IndexLocalType_t i = m_hAOETargetEffects.Head() ;
-				  m_hAOETargetEffects.IsValidIndex(i) ;
-				  i = m_hAOETargetEffects.Next(i) )
+			for ( AOEGrenTargetFXList_t::IndexLocalType_t j = m_hAOETargetEffects.Head() ;
+				  m_hAOETargetEffects.IsValidIndex(j) ;
+				  j = m_hAOETargetEffects.Next(j) )
 			{
-				if ( m_hAOETargetEffects[i].hTarget.Get() == pTarget )
+				if ( m_hAOETargetEffects[j].hTarget.Get() == pTarget )
 				{
 					bHaveEffect = true;
 					break;
diff --git a/src/game/client/swarm/c_asw_aoegrenade_projectile.h b/src/game/client/swarm/c_asw_aoegrenade_projectile.h
@@ -35,7 +35,7 @@ class C_ASW_AOEGrenade_Projectile : public C_BaseCombatCharacter, public IASW_AO
 	virtual const char* GetStartSoundName( void ) { return "ASW_BuffGrenade.StartBuff"; }
 	virtual const char* GetActivateSoundName( void ) { return "ASW_BuffGrenade.GrenadeActivate"; }
 	virtual const char* GetPingEffectName( void ) { return "buffgrenade_pulse"; }
-	virtual const char* GetArcEffectName( int index ) { return "buffgrenade_attach_arc"; }
+	virtual const char* GetArcEffectName( int i ) { return "buffgrenade_attach_arc"; }
 	virtual const char* GetArcAttachmentName( void ) { return "weapon_aim_attachment"; }
 	virtual int GetArcEffectIndex( C_BaseEntity *pEnt ) { return 0; }
 	virtual bool ShouldAttachEffectToWeapon( void ) { return false; }
diff --git a/src/game/client/swarm/c_asw_buffgrenade_projectile.h b/src/game/client/swarm/c_asw_buffgrenade_projectile.h
@@ -16,7 +16,7 @@ class C_ASW_BuffGrenade_Projectile : public C_ASW_AOEGrenade_Projectile, public
 	virtual const char* GetStartSoundName( void ) override { return "ASW_BuffGrenade.StartBuff"; }
 	virtual const char* GetActivateSoundName( void ) override { return "ASW_BuffGrenade.GrenadeActivate"; }
 	virtual const char* GetPingEffectName( void ) override { return "buffgrenade_pulse"; }
-	virtual const char* GetArcEffectName( int index ) override { return index == 1 ? "buffgrenade_noconnect" : "buffgrenade_attach_arc"; }
+	virtual const char* GetArcEffectName( int i ) override { return i == 1 ? "buffgrenade_noconnect" : "buffgrenade_attach_arc"; }
 	virtual const char* GetArcAttachmentName( void ) override { return "beam_attach"; }
 	virtual int GetArcEffectIndex( C_BaseEntity *pEnt ) override;
 	virtual bool ShouldAttachEffectToWeapon( void ) override { return true; }
diff --git a/src/game/client/swarm/c_asw_entity_dissolve.cpp b/src/game/client/swarm/c_asw_entity_dissolve.cpp
@@ -206,7 +206,6 @@ void C_ASW_Entity_Dissolve::BuildTeslaEffect( mstudiobbox_t *pHitBox, const matr
 
 			// Move it towards the camera
 			Vector vecFlash = tr.endpos;
-			Vector vecForward;
 			AngleVectors( MainViewAngles(nSlot), &vecForward );
 			vecFlash -= (vecForward * 8);
 
diff --git a/src/game/client/swarm/gameui/swarm/vitemshowcase.cpp b/src/game/client/swarm/gameui/swarm/vitemshowcase.cpp
@@ -473,17 +473,17 @@ void ItemShowcase::ShowItems( SteamInventoryResult_t hResult, int iStart, int iC
 		{
 			// replace previous versions of this item's state in the queue
 			bool bFound = false;
-			FOR_EACH_VEC( pItemShowcase->m_Queue, i )
+			FOR_EACH_VEC( pItemShowcase->m_Queue, j )
 			{
-				if ( pItemShowcase->m_QueueExtra[i] != 0 || pItemShowcase->m_QueueType[i] != mode )
+				if ( pItemShowcase->m_QueueExtra[j] != 0 || pItemShowcase->m_QueueType[j] != mode )
 				{
 					continue;
 				}
 
-				if ( pItemShowcase->m_Queue[i]->ItemID == pInstance->ItemID )
+				if ( pItemShowcase->m_Queue[j]->ItemID == pInstance->ItemID )
 				{
-					delete pItemShowcase->m_Queue[i];
-					pItemShowcase->m_Queue[i] = pInstance;
+					delete pItemShowcase->m_Queue[j];
+					pItemShowcase->m_Queue[j] = pInstance;
 					bFound = true;
 					break;
 				}
diff --git a/src/game/client/swarm/rd_collections_crafting.cpp b/src/game/client/swarm/rd_collections_crafting.cpp
@@ -136,6 +136,8 @@ void CRD_Crafting_Panel::OnCommand( const char *szCommand )
 			// (this assumption allows us to use a greedy algorithm)
 			FOR_EACH_VEC( variant.m_Inputs, j )
 			{
+				Assert( variant.m_Inputs[j].m_iQuantity == 1 );
+
 				FOR_EACH_VEC( variant.m_Inputs[j].m_AllowedItem, k )
 				{
 					CUtlVector<ReactiveDropInventory::ItemInstance_t> instances;
diff --git a/src/game/server/swarm/asw_player.cpp b/src/game/server/swarm/asw_player.cpp
@@ -2605,7 +2605,7 @@ void CASW_Player::ChangeName( const char *pszNewName )
 	if (rd_add_index_to_name.GetBool())
 	{
 		char tempName[MAX_PLAYER_NAME_LENGTH];
-		int n = V_snprintf(tempName, sizeof(tempName) - 1, "%d-%s", ENTINDEX(edict()), pszNewName);
+		V_snprintf(tempName, sizeof(tempName) - 1, "%d-%s", ENTINDEX(edict()), pszNewName);
 		UTIL_SafeUtf8Truncate(tempName, sizeof(tempName));
 		if (V_strncmp(pszOldName, tempName, sizeof(tempName)) == 0)
 		{
diff --git a/src/game/shared/swarm/asw_weapon_cryo_cannon_shared.cpp b/src/game/shared/swarm/asw_weapon_cryo_cannon_shared.cpp
@@ -226,7 +226,6 @@ void CASW_Weapon_Cryo_Cannon::PrimaryAttack()
 		return;
 	}
 
-	CASW_Player *pPlayer = GetCommander();
 	CASW_Marine *pMarine = GetMarine();
 	if ( !pMarine )
 		return;
@@ -290,6 +289,7 @@ void CASW_Weapon_Cryo_Cannon::PrimaryAttack()
 
 	Vector vecSrc = pMarine->Weapon_ShootPosition();
 	Vector vecAiming = vec3_origin;
+	CASW_Player *pPlayer = GetCommander();
 	if ( pPlayer && pMarine->IsInhabited() )
 	{
 		vecAiming = pPlayer->GetAutoaimVectorForMarine( pMarine, GetAutoAimAmount(), GetVerticalAdjustOnlyAutoAimAmount() );
diff --git a/src/game/shared/swarm/asw_weapon_flamer_shared.cpp b/src/game/shared/swarm/asw_weapon_flamer_shared.cpp
@@ -233,9 +233,7 @@ void CASW_Weapon_Flamer::PrimaryAttack( void )
 		return;
 	}
 
-	CASW_Player *pPlayer = GetCommander();
 	CASW_Marine *pMarine = GetMarine();
-
 	if (pMarine)		// firing from a marine
 	{
 		// MUST call sound before removing a round from the clip of a CMachineGun
@@ -253,6 +251,7 @@ void CASW_Weapon_Flamer::PrimaryAttack( void )
 #ifndef CLIENT_DLL
 		Vector vecSrc = pMarine->Weapon_ShootPosition( );
 		Vector vecAiming = vec3_origin;
+		CASW_Player *pPlayer = GetCommander();
 		if ( pPlayer && pMarine->IsInhabited() )
 		{
 			vecAiming = pPlayer->GetAutoaimVectorForMarine(pMarine, GetAutoAimAmount(), GetVerticalAdjustOnlyAutoAimAmount());	// 45 degrees = 0.707106781187
diff --git a/src/game/shared/swarm/rd_crafting_defs.h b/src/game/shared/swarm/rd_crafting_defs.h
@@ -100,6 +100,7 @@ struct RD_Crafting_Recipe_Input
 {
 	CCopyableUtlVector<SteamItemDef_t> m_AllowedItem;
 	uint32_t m_iFlags = 0;
+	uint32_t m_iQuantity = 1;
 };
 
 struct RD_Crafting_Recipe_Variant
diff --git a/src/game/shared/swarm/rd_inventory_shared.cpp b/src/game/shared/swarm/rd_inventory_shared.cpp
@@ -281,21 +281,34 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 
 		m_HighOwnedInventoryDefIDs.Purge();
 
+		CUtlMap<SteamItemDef_t, CCopyableUtlVector<SteamItemInstanceID_t>> autoStackDefs( DefLessFunc( SteamItemDef_t ) );
 		for ( uint32 i = 0; i < nItems; i++ )
 		{
 			ReactiveDropInventory::ItemInstance_t instance{ hResult, i };
 			m_LocalInventoryCache.AddToTail( instance );
 
-			// precache item def + icon
-			( void )ReactiveDropInventory::GetItemDef( instance.ItemDefID );
+			// precache item def + icon and check for auto-stack flag
+			const ReactiveDropInventory::ItemDef_t *pDef = ReactiveDropInventory::GetItemDef( instance.ItemDefID );
+			if ( pDef && pDef->AutoStack )
+			{
+				unsigned short index = autoStackDefs.Find( instance.ItemDefID );
+				if ( !autoStackDefs.IsValidIndex( index ) )
+				{
+					index = autoStackDefs.Insert( instance.ItemDefID );
+				}
+
+				autoStackDefs[index].AddToTail( instance.ItemID );
+			}
 
 			// The Steam inventory API doesn't list item def IDs that are between 1 million and 1 billion unless we ask about them specifically.
 			// If we own any items with def IDs in this range, remember that and re-write the schema cache to include them.
 			// These IDs are used for donation receipt medals as well as unique medals.
 			if ( instance.ItemDefID >= 1000000 )
 			{
 				if ( !m_HighOwnedInventoryDefIDs.IsValidIndex( m_HighOwnedInventoryDefIDs.Find( instance.ItemDefID ) ) )
+				{
 					m_HighOwnedInventoryDefIDs.AddToTail( instance.ItemDefID );
+				}
 			}
 		}
 
@@ -320,6 +333,33 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 			}
 		}
 
+		if ( rd_debug_inventory.GetBool() )
+		{
+			DevMsg( 3, "Verifying %d auto-stack defs...\n", autoStackDefs.Count() );
+		}
+		FOR_EACH_MAP_FAST( autoStackDefs, i )
+		{
+			if ( autoStackDefs[i].Count() == 1 )
+			{
+				continue;
+			}
+
+			Assert( autoStackDefs[i].Count() != 0 );
+
+			if ( rd_debug_inventory.GetBool() )
+			{
+				Msg( "Have %d stacks of auto-stack item %d; merging\n", autoStackDefs[i].Count(), autoStackDefs.Key( i ) );
+			}
+
+			pInventory->TransferItemQuantity( AddCraftItemTask( CRAFT_AUTO_STACK, autoStackDefs.Key( i ) ), autoStackDefs[i][1], GetLocalItemCache( autoStackDefs[i][1] )->Quantity, autoStackDefs[i][0] );
+			if ( autoStackDefs[i].Count() > 2 )
+			{
+				m_CraftingQueue.Tail()->m_RetryItemList.AddVectorToTail( autoStackDefs[i] );
+				m_CraftingQueue.Tail()->m_RetryItemList.FastRemove( 1 );
+				m_CraftingQueue.Tail()->m_RetryItemList.FastRemove( 0 );
+			}
+		}
+
 		ThreadExecute( WriteInventoryCacheHelper );
 	}
 
@@ -1277,6 +1317,7 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 			case CRAFT_DELETE_SILENT:
 			case CRAFT_NOTIFICATION_DYNAMIC_PROPERTY_UPDATE:
 			case CRAFT_AUTO_BACKGROUND:
+			case CRAFT_AUTO_STACK:
 				break;
 			default:
 				Assert( !"unhandled crafting task type" );
@@ -1313,6 +1354,7 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 		case CRAFT_DELETE_SILENT:
 		case CRAFT_NOTIFICATION_DYNAMIC_PROPERTY_UPDATE:
 		case CRAFT_AUTO_BACKGROUND:
+		case CRAFT_AUTO_STACK:
 			break;
 		default:
 			Assert( !"unhandled crafting task type" );
@@ -1457,14 +1499,22 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 						continue;
 					}
 
+					char buf[12]{};
+					uint32 len = sizeof( buf );
+					int32 quantity = 0;
+					if ( pInventory->GetResultItemProperty( pTask->m_hResult, i, "quantity", buf, &len ) )
+					{
+						quantity = strtol( buf, NULL, 10 );
+					}
+
 					if ( const ItemInstance_t *pCached = GetLocalItemCache( diff[i].m_itemId ) )
 					{
-						diff[i].m_unQuantity = MAX( 0, int( diff[i].m_unQuantity ) - pCached->Quantity );
+						quantity = MAX( 0, quantity - pCached->Quantity );
 					}
 
 					if ( diff[i].m_iDefinition == g_RD_Crafting_Material_Info[eMaterialType].m_iItemDef )
 					{
-						added = diff[i].m_unQuantity;
+						added += quantity;
 					}
 				}
 
@@ -1527,6 +1577,53 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 			break;
 		case CRAFT_AUTO_BACKGROUND:
 			break;
+		case CRAFT_AUTO_STACK:
+			if ( pTask->m_RetryItemList.Count() != 0 )
+			{
+				uint32 nCount{};
+				pInventory->GetResultItems( pTask->m_hResult, NULL, &nCount );
+				CUtlVector<SteamItemDetails_t> items;
+				items.AddMultipleToTail( nCount );
+				pInventory->GetResultItems( pTask->m_hResult, items.Base(), &nCount );
+
+				SteamItemInstanceID_t iStacked = k_SteamItemInstanceIDInvalid;
+				FOR_EACH_VEC( items, i )
+				{
+					if ( items[i].m_unFlags & ( k_ESteamItemConsumed | k_ESteamItemRemoved ) )
+					{
+						continue;
+					}
+
+					char buf[12]{};
+					uint32 len = sizeof( buf );
+					int32 quantity = 0;
+					if ( pInventory->GetResultItemProperty( pTask->m_hResult, i, "quantity", buf, &len ) )
+					{
+						quantity = strtol( buf, NULL, 10 );
+					}
+
+					if ( quantity > 0 )
+					{
+						Assert( items[i].m_iDefinition == pTask->m_iAccessoryDef );
+						Assert( iStacked == k_SteamItemInstanceIDInvalid );
+						iStacked = items[i].m_itemId;
+					}
+				}
+
+				Assert( iStacked != k_SteamItemInstanceIDInvalid );
+				if ( iStacked != k_SteamItemInstanceIDInvalid )
+				{
+					if ( rd_debug_inventory.GetBool() )
+					{
+						Msg( "Have %d remaining stacks of auto-stack item %d; merging\n", pTask->m_RetryItemList.Count() + 1, pTask->m_iAccessoryDef );
+					}
+
+					pInventory->TransferItemQuantity( AddCraftItemTask( CRAFT_AUTO_STACK, pTask->m_iAccessoryDef ), pTask->m_RetryItemList[0], GetLocalItemCache( pTask->m_RetryItemList[0] )->Quantity, iStacked );
+					m_CraftingQueue.Tail()->m_RetryItemList.AddVectorToTail( pTask->m_RetryItemList );
+					m_CraftingQueue.Tail()->m_RetryItemList.FastRemove( 0 );
+				}
+			}
+			break;
 		default:
 			Assert( !"unhandled crafting task type" );
 			break;
diff --git a/src/game/shared/swarm/rd_inventory_shared.h b/src/game/shared/swarm/rd_inventory_shared.h
@@ -236,6 +236,8 @@ namespace ReactiveDropInventory
 		CRAFT_NOTIFICATION_DYNAMIC_PROPERTY_UPDATE,
 		// automated actions, like upgrading stacks of medals after a player has added a new color to the stack.
 		CRAFT_AUTO_BACKGROUND,
+		// automatically fixing auto-stack items that are in separate piles.
+		CRAFT_AUTO_STACK,
 	};
 	void PerformCraftingAction( CraftItemType_t eCraftType, SteamItemDef_t recipe, std::initializer_list<SteamItemInstanceID_t> ingredient, std::initializer_list<uint32> quantity, SteamItemDef_t iAccessoryDef = 0, SteamItemInstanceID_t iReplaceItemInstance = k_SteamItemInstanceIDInvalid );
 	void RequestFullInventoryRefresh();

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ void CASWNightVisionSelfIllumProxy::OnBind( void *pC_BaseEntity )`
`566`	`566`	`EXPOSE_MATERIAL_PROXY( CASWNightVisionSelfIllumProxy, NightVisionSelfIllum );`
`567`	`567`
`568`	`568`
`569`		`-void CASWViewRender::PerformNightVisionEffect( const CViewSetup &view )`
	`569`	`+void CASWViewRender::PerformNightVisionEffect( const CViewSetup &setup )`
`570`	`570`	`{`
`571`	`571`	`C_ASW_Player *pPlayer = C_ASW_Player::GetLocalASWPlayer();`
`572`	`572`	`if ( !pPlayer )`
`@@ -587,7 +587,7 @@ void CASWViewRender::PerformNightVisionEffect( const CViewSetup &view )`
`587`	`587`	`{`
`588`	`588`	`byte overlaycolor[4] = { 0, 255, 0, 255 };`
`589`	`589`
`590`		`- UpdateScreenEffectTexture( 0, view.x, view.y, view.width, view.height );`
	`590`	`+ UpdateScreenEffectTexture( 0, setup.x, setup.y, setup.width, setup.height );`
`591`	`591`
`592`	`592`	`overlaycolor[3] = flVisionAlpha;`
`593`	`593`
Original file line number	Diff line number	Diff line change
`@@ -204,11 +204,11 @@ void C_ASW_AOEGrenade_Projectile::UpdateTargetAOEEffects( void )`
`204`	`204`	`{`
`205`	`205`	`bool bHaveEffect = false;`
`206`	`206`
`207`		`- for ( AOEGrenTargetFXList_t::IndexLocalType_t i = m_hAOETargetEffects.Head() ;`
`208`		`- m_hAOETargetEffects.IsValidIndex(i) ;`
`209`		`- i = m_hAOETargetEffects.Next(i) )`
	`207`	`+ for ( AOEGrenTargetFXList_t::IndexLocalType_t j = m_hAOETargetEffects.Head() ;`
	`208`	`+ m_hAOETargetEffects.IsValidIndex(j) ;`
	`209`	`+ j = m_hAOETargetEffects.Next(j) )`
`210`	`210`	`{`
`211`		`- if ( m_hAOETargetEffects[i].hTarget.Get() == pTarget )`
	`211`	`+ if ( m_hAOETargetEffects[j].hTarget.Get() == pTarget )`
`212`	`212`	`{`
`213`	`213`	`bHaveEffect = true;`
`214`	`214`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -473,17 +473,17 @@ void ItemShowcase::ShowItems( SteamInventoryResult_t hResult, int iStart, int iC`
`473`	`473`	`{`
`474`	`474`	`// replace previous versions of this item's state in the queue`
`475`	`475`	`bool bFound = false;`
`476`		`- FOR_EACH_VEC( pItemShowcase->m_Queue, i )`
	`476`	`+ FOR_EACH_VEC( pItemShowcase->m_Queue, j )`
`477`	`477`	`{`
`478`		`- if ( pItemShowcase->m_QueueExtra[i] != 0 \|\| pItemShowcase->m_QueueType[i] != mode )`
	`478`	`+ if ( pItemShowcase->m_QueueExtra[j] != 0 \|\| pItemShowcase->m_QueueType[j] != mode )`
`479`	`479`	`{`
`480`	`480`	`continue;`
`481`	`481`	`}`
`482`	`482`
`483`		`- if ( pItemShowcase->m_Queue[i]->ItemID == pInstance->ItemID )`
	`483`	`+ if ( pItemShowcase->m_Queue[j]->ItemID == pInstance->ItemID )`
`484`	`484`	`{`
`485`		`- delete pItemShowcase->m_Queue[i];`
`486`		`- pItemShowcase->m_Queue[i] = pInstance;`
	`485`	`+ delete pItemShowcase->m_Queue[j];`
	`486`	`+ pItemShowcase->m_Queue[j] = pInstance;`
`487`	`487`	`bFound = true;`
`488`	`488`	`break;`
`489`	`489`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,8 @@ void CRD_Crafting_Panel::OnCommand( const char *szCommand )`
`136`	`136`	`// (this assumption allows us to use a greedy algorithm)`
`137`	`137`	`FOR_EACH_VEC( variant.m_Inputs, j )`
`138`	`138`	`{`
	`139`	`+ Assert( variant.m_Inputs[j].m_iQuantity == 1 );`
	`140`	`+`
`139`	`141`	`FOR_EACH_VEC( variant.m_Inputs[j].m_AllowedItem, k )`
`140`	`142`	`{`
`141`	`143`	`CUtlVector<ReactiveDropInventory::ItemInstance_t> instances;`
Original file line number	Diff line number	Diff line change
`@@ -2605,7 +2605,7 @@ void CASW_Player::ChangeName( const char *pszNewName )`
`2605`	`2605`	`if (rd_add_index_to_name.GetBool())`
`2606`	`2606`	`{`
`2607`	`2607`	`char tempName[MAX_PLAYER_NAME_LENGTH];`
`2608`		`- int n = V_snprintf(tempName, sizeof(tempName) - 1, "%d-%s", ENTINDEX(edict()), pszNewName);`
	`2608`	`+ V_snprintf(tempName, sizeof(tempName) - 1, "%d-%s", ENTINDEX(edict()), pszNewName);`
`2609`	`2609`	`UTIL_SafeUtf8Truncate(tempName, sizeof(tempName));`
`2610`	`2610`	`if (V_strncmp(pszOldName, tempName, sizeof(tempName)) == 0)`
`2611`	`2611`	`{`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,6 @@ void CASW_Weapon_Cryo_Cannon::PrimaryAttack()`
`226`	`226`	`return;`
`227`	`227`	`}`
`228`	`228`
`229`		`- CASW_Player *pPlayer = GetCommander();`
`230`	`229`	`CASW_Marine *pMarine = GetMarine();`
`231`	`230`	`if ( !pMarine )`
`232`	`231`	`return;`
`@@ -290,6 +289,7 @@ void CASW_Weapon_Cryo_Cannon::PrimaryAttack()`
`290`	`289`
`291`	`290`	`Vector vecSrc = pMarine->Weapon_ShootPosition();`
`292`	`291`	`Vector vecAiming = vec3_origin;`
	`292`	`+ CASW_Player *pPlayer = GetCommander();`
`293`	`293`	`if ( pPlayer && pMarine->IsInhabited() )`
`294`	`294`	`{`
`295`	`295`	`vecAiming = pPlayer->GetAutoaimVectorForMarine( pMarine, GetAutoAimAmount(), GetVerticalAdjustOnlyAutoAimAmount() );`
Original file line number	Diff line number	Diff line change
`@@ -233,9 +233,7 @@ void CASW_Weapon_Flamer::PrimaryAttack( void )`
`233`	`233`	`return;`
`234`	`234`	`}`
`235`	`235`
`236`		`- CASW_Player *pPlayer = GetCommander();`
`237`	`236`	`CASW_Marine *pMarine = GetMarine();`
`238`		`-`
`239`	`237`	`if (pMarine) // firing from a marine`
`240`	`238`	`{`
`241`	`239`	`// MUST call sound before removing a round from the clip of a CMachineGun`
`@@ -253,6 +251,7 @@ void CASW_Weapon_Flamer::PrimaryAttack( void )`
`253`	`251`	`#ifndef CLIENT_DLL`
`254`	`252`	`Vector vecSrc = pMarine->Weapon_ShootPosition( );`
`255`	`253`	`Vector vecAiming = vec3_origin;`
	`254`	`+ CASW_Player *pPlayer = GetCommander();`
`256`	`255`	`if ( pPlayer && pMarine->IsInhabited() )`
`257`	`256`	`{`
`258`	`257`	`vecAiming = pPlayer->GetAutoaimVectorForMarine(pMarine, GetAutoAimAmount(), GetVerticalAdjustOnlyAutoAimAmount()); // 45 degrees = 0.707106781187`