games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-02 22:05:43 +02:00
Code Issues Releases Activity

fix build

Browse Source
This commit is contained in:
SoundSSGood 2023-09-19 14:10:25 +03:00
parent 9cc623c981
commit 6280e778dc
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/widgets/CExchangeController.cpp
View File

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

2
client/windows/GUIClasses.cpp
View File

@ -755,7 +755,7 @@ CExchangeWindow::CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2,
if(qeLayout) 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 moveEquipped = true;
bool moveBackpack = true; bool moveBackpack = true;

5
lib/CArtifactInstance.cpp
View File

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