games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge pull request #2055 from SoundSSGood/cartifactholder-rework

Browse Source 
Artifact related code refactoring part2 (client CArtifactHolder)
This commit is contained in:
Ivan Savenko
2023-05-01 02:33:08 +03:00
committed by GitHub
parent d2e0d6a754 8b531ca6c4
commit 4aa232a60a
28 changed files with 1470 additions and 1205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/CGameHandler.cpp
View File

@@ -3902,7 +3902,7 @@ bool CGameHandler::moveArtifact(const ArtifactLocation &al1, const ArtifactLocat
if(srcArtifact == nullptr)
COMPLAIN_RET("No artifact to move!");
if(destArtifact && srcPlayer != dstPlayer)
if(destArtifact && srcPlayer != dstPlayer && !isDstSlotBackpack)
COMPLAIN_RET("Can't touch artifact on hero of another player!");
// Check if src/dest slots are appropriate for the artifacts exchanged.