games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Fixed move checks. Backpack buttons.

Browse Source
This commit is contained in:
SoundSSGood
2023-09-18 22:58:08 +03:00
parent f47def3588
commit 9cc623c981
9 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/widgets/CWindowWithArtifacts.cpp
View File

@@ -27,13 +27,18 @@
#include "../../lib/mapObjects/CGHeroInstance.h"
void CWindowWithArtifacts::addSet(CArtifactsOfHeroPtr artSet)
{
artSets.emplace_back(artSet);
}
void CWindowWithArtifacts::addSetAndCallbacks(CArtifactsOfHeroPtr artSet)
{
CArtifactsOfHeroBase::PutBackPickedArtCallback artPutBackHandler = []() -> void
{
CCS->curh->dragAndDropCursor(nullptr);
};
artSets.emplace_back(artSet);
addSet(artSet);
std::visit([this, artPutBackHandler](auto artSetWeak)
{
auto artSet = artSetWeak.lock();

3
client/widgets/CWindowWithArtifacts.h
View File

@@ -28,6 +28,7 @@ public:
using CloseCallback = std::function<void()>;
void addSet(CArtifactsOfHeroPtr artSet);
void addSetAndCallbacks(CArtifactsOfHeroPtr artSet);
void addCloseCallback(CloseCallback callback);
const CGHeroInstance * getHeroPickedArtifact();
const CArtifactInstance * getPickedArtifact();
@@ -39,7 +40,7 @@ public:
void artifactDisassembled(const ArtifactLocation & artLoc) override;
void artifactAssembled(const ArtifactLocation & artLoc) override;
private:
protected:
std::vector<CArtifactsOfHeroPtr> artSets;
CloseCallback closeCallback;