浏览代码

fix build

SoundSSGood 2 年之前
父节点
当前提交
6280e778dc
共有 3 个文件被更改,包括 5 次插入4 次删除
  1. 1 1
      client/widgets/CExchangeController.cpp
  2. 1 1
      client/windows/GUIClasses.cpp
  3. 3 2
      lib/CArtifactInstance.cpp

+ 1 - 1
client/widgets/CExchangeController.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-
+#include "StdInc.h"
 #include "CExchangeController.h"
 
 #include "../CPlayerInterface.h"

+ 1 - 1
client/windows/GUIClasses.cpp

@@ -755,7 +755,7 @@ CExchangeWindow::CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2,
 
 	if(qeLayout)
 	{
-		auto moveArtifacts = [this](const std::function<void(bool, bool)> moveRoutine) -> void
+		auto moveArtifacts = [](const std::function<void(bool, bool)> moveRoutine) -> void
 		{
 			bool moveEquipped = true;
 			bool moveBackpack = true;

+ 3 - 2
lib/CArtifactInstance.cpp

@@ -52,7 +52,7 @@ const std::vector<CCombinedArtifactInstance::PartInfo> & CCombinedArtifactInstan
 void CCombinedArtifactInstance::addPlacementMap(CArtifactSet::ArtPlacementMap & placementMap)
 {
 	if(!placementMap.empty())
-		for(auto& part : partsInfo)
+		for(auto & part : partsInfo)
 		{
 			assert(placementMap.find(part.art) != placementMap.end());
 			part.slot = placementMap.at(part.art);
@@ -167,7 +167,8 @@ bool CArtifactInstance::isCombined() const
 
 void CArtifactInstance::putAt(const ArtifactLocation & al)
 {
-	addPlacementMap(al.getHolderArtSet()->putArtifact(al.slot, this));
+	auto placementMap = al.getHolderArtSet()->putArtifact(al.slot, this);
+	addPlacementMap(placementMap);
 }
 
 void CArtifactInstance::removeFrom(const ArtifactLocation & al)