changed applying magazine upgrade to be inline with other inventory functions, no predction, confirmation from server on client

Author: iniside

Source/ActionRPGGame/Public/Weapons/ARWeaponInventoryComponent.cpp

@@ -648,9 +648,11 @@ void UARWeaponInventoryComponent::AddMagazineMod(int8 WeaponIdx, int8 MagazineMo
 	if (GetOwnerRole() < ENetRole::ROLE_Authority)
 	{
 		ServerAddMagazineMod(WeaponIdx, MagazineModIndex);
+		return;
 	}
-
-	//Predictively apply mod on client, and show it on UI.
+}
+void UARWeaponInventoryComponent::ServerAddMagazineMod_Implementation(int8 WeaponIdx, int8 MagazineModIndex)
+{
 	if (AARCharacter* Character = Cast<AARCharacter>(GetOwner()))
 	{
 		if (AARPlayerController* PC = Cast<AARPlayerController>(Character->Controller))
@@ -664,16 +666,18 @@ void UARWeaponInventoryComponent::AddMagazineMod(int8 WeaponIdx, int8 MagazineMo
 				if (Weapon)
 				{
 					Weapon->AddMagazineUpgrade(Magazine);
-					FARWeaponModInfo Info;
-					Info.Icon = Magazine->Icon->GetPathName();
-					Info.UpgradeType = EARWeaponUpgradeType::Magazine;
-					Weapon->ClientOnMagazineAdded(Info);
+					ClientAddMagazineMod(WeaponIdx, MagazineModIndex);
 				}
 			}
 		}
 	}
 }
-void UARWeaponInventoryComponent::ServerAddMagazineMod_Implementation(int8 WeaponIdx, int8 MagazineModIndex)
+bool UARWeaponInventoryComponent::ServerAddMagazineMod_Validate(int8 WeaponIdx, int8 MagazineModIndex)
+{
+	return true;
+}
+
+void UARWeaponInventoryComponent::ClientAddMagazineMod_Implementation(int8 WeaponIdx, int8 MagazineModIndex)
 {
 	if (AARCharacter* Character = Cast<AARCharacter>(GetOwner()))
 	{
@@ -688,13 +692,13 @@ void UARWeaponInventoryComponent::ServerAddMagazineMod_Implementation(int8 Weapo
 				if (Weapon)
 				{
 					Weapon->AddMagazineUpgrade(Magazine);
+					FARWeaponModInfo Info;
+					Info.Icon = Magazine->Icon->GetPathName();
+					Info.UpgradeType = EARWeaponUpgradeType::Magazine;
+					Weapon->ClientOnMagazineAdded(Info);
 					MainInventory->RemoveItem(MagazineModIndex);
 				}
 			}
 		}
 	}
-}
-bool UARWeaponInventoryComponent::ServerAddMagazineMod_Validate(int8 WeaponIdx, int8 MagazineModIndex)
-{
-	return true;
 }

Source/ActionRPGGame/Public/Weapons/ARWeaponInventoryComponent.h

@@ -184,4 +184,8 @@ class ACTIONRPGGAME_API UARWeaponInventoryComponent : public UIFEquipmentCompone
 	void ServerAddMagazineMod_Implementation(int8 WeaponIdx, int8 MagazineModIndex);
 	bool ServerAddMagazineMod_Validate(int8 WeaponIdx, int8 MagazineModIndex);
 
+	UFUNCTION(Client, Reliable)
+		void ClientAddMagazineMod(int8 WeaponIdx, int8 MagazineModIndex);
+	void ClientAddMagazineMod_Implementation(int8 WeaponIdx, int8 MagazineModIndex);
+
 };