Browse Source

Apply suggested cosmetic changes

SoundSSGood 2 years ago
parent
commit
aef87dd482
4 changed files with 16 additions and 14 deletions
  1. 3 2
      lib/CArtHandler.cpp
  2. 3 2
      lib/CArtHandler.h
  3. 4 4
      lib/NetPacksLib.cpp
  4. 6 6
      server/CGameHandler.cpp

+ 3 - 2
lib/CArtHandler.cpp

@@ -1490,8 +1490,9 @@ ArtBearer::ArtBearer CArtifactFittingSet::bearerType() const
 	return this->Bearer;
 }
 
-DLL_LINKAGE ArtifactPosition ArtifactUtils::getArtifactDstPosition(const CArtifactInstance * artifact,
-	const CArtifactSet * target, ArtBearer::ArtBearer bearer)
+DLL_LINKAGE ArtifactPosition ArtifactUtils::getArtifactDstPosition(	const CArtifactInstance * artifact,
+																	const CArtifactSet * target, 
+																	ArtBearer::ArtBearer bearer)
 {
 	for(auto slot : artifact->artType->possibleSlots.at(bearer))
 	{

+ 3 - 2
lib/CArtHandler.h

@@ -380,8 +380,9 @@ protected:
 namespace ArtifactUtils
 {
 	// Calculates where an artifact gets placed when it gets transferred from one hero to another.
-	DLL_LINKAGE ArtifactPosition getArtifactDstPosition(const CArtifactInstance * artifact, const CArtifactSet * target,
-		ArtBearer::ArtBearer bearer);
+	DLL_LINKAGE ArtifactPosition getArtifactDstPosition(const CArtifactInstance * artifact, 
+														const CArtifactSet * target,
+														ArtBearer::ArtBearer bearer);
 	DLL_LINKAGE std::vector<ArtifactPosition> unmovablePositions(); // TODO: Make this constexpr when the toolset is upgraded
 	DLL_LINKAGE bool isArtRemovable(const std::pair<ArtifactPosition, ArtSlotInfo> & slot);
 	DLL_LINKAGE bool checkSpellbookIsNeeded(const CGHeroInstance * heroPtr, ArtifactID artID, ArtifactPosition slot);

+ 4 - 4
lib/NetPacksLib.cpp

@@ -1150,14 +1150,14 @@ DLL_LINKAGE void BulkMoveArtifacts::applyGs(CGameState * gs)
 		// Swap
 		auto leftSet = getSrcHolderArtSet();
 		auto rightSet = getDstHolderArtSet();
-		CArtifactFittingSet ArtFittingSet(leftSet->bearerType());
+		CArtifactFittingSet artFittingSet(leftSet->bearerType());
 
-		ArtFittingSet.artifactsWorn = rightSet->artifactsWorn;
-		ArtFittingSet.artifactsInBackpack = rightSet->artifactsInBackpack;
+		artFittingSet.artifactsWorn = rightSet->artifactsWorn;
+		artFittingSet.artifactsInBackpack = rightSet->artifactsInBackpack;
 
 		bulkArtsOperation(artsPack1, rightSet, EBulkArtsOp::BULK_REMOVE);
 		bulkArtsOperation(artsPack0, leftSet, EBulkArtsOp::BULK_MOVE);
-		bulkArtsOperation(artsPack1, &ArtFittingSet, EBulkArtsOp::BULK_PUT);
+		bulkArtsOperation(artsPack1, &artFittingSet, EBulkArtsOp::BULK_PUT);
 	}
 	else
 	{

+ 6 - 6
server/CGameHandler.cpp

@@ -3977,15 +3977,15 @@ bool CGameHandler::bulkMoveArtifacts(ObjectInstanceID srcHero, ObjectInstanceID
 	else
 	{
 		// Temporary fitting set for artifacts. Used to select available slots before sending data.
-		CArtifactFittingSet ArtFittingSet(pdstHero->bearerType());
-		ArtFittingSet.artifactsInBackpack = pdstHero->artifactsInBackpack;
-		ArtFittingSet.artifactsWorn = pdstHero->artifactsWorn;
+		CArtifactFittingSet artFittingSet(pdstHero->bearerType());
+		artFittingSet.artifactsInBackpack = pdstHero->artifactsInBackpack;
+		artFittingSet.artifactsWorn = pdstHero->artifactsWorn;
 
-		auto moveArtifact = [this, &ArtFittingSet, &slotsSrcDst](const CArtifactInstance * artifact,
+		auto moveArtifact = [this, &artFittingSet, &slotsSrcDst](const CArtifactInstance * artifact,
 			ArtifactPosition srcSlot, const CGHeroInstance * pdstHero) -> void
 		{
-			auto dstSlot = ArtifactUtils::getArtifactDstPosition(artifact, &ArtFittingSet, pdstHero->bearerType());
-			ArtFittingSet.putArtifact(dstSlot, static_cast<ConstTransitivePtr<CArtifactInstance>>(artifact));
+			auto dstSlot = ArtifactUtils::getArtifactDstPosition(artifact, &artFittingSet, pdstHero->bearerType());
+			artFittingSet.putArtifact(dstSlot, static_cast<ConstTransitivePtr<CArtifactInstance>>(artifact));
 			slotsSrcDst.push_back(BulkMoveArtifacts::LinkedSlots(srcSlot, dstSlot));
 
 			if(ArtifactUtils::checkSpellbookIsNeeded(pdstHero, artifact->artType->id, dstSlot))