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

Merge branch 'develop' into 'lobby'

Browse Source
This commit is contained in:
Ivan Savenko
2024-02-11 16:13:13 +02:00
parent 1a144fc516 51f24178a3
commit f2ecd4cf11
141 changed files with 908 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/CGameHandler.cpp
View File

@@ -1189,7 +1189,7 @@ bool CGameHandler::moveHero(ObjectInstanceID hid, int3 dst, ui8 teleporting, boo
if (leavingTile == LEAVING_TILE)
leaveTile();
if (isInTheMap(guardPos))
if (lookForGuards == CHECK_FOR_GUARDS && isInTheMap(guardPos))
tmh.attackedFrom = std::make_optional(guardPos);
tmh.result = result;