1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

- a bit less memory usage during compilation with gcc, new file - RegisterTypes.cpp

- fixed several issues related to visiting town by ally
- fixed #1215
This commit is contained in:
Ivan Savenko
2013-02-23 12:22:23 +00:00
parent fbb1ae1bb8
commit 74ac44662c
18 changed files with 87 additions and 86 deletions

View File

@@ -1722,6 +1722,8 @@ bool CGameHandler::moveHero( ObjectInstanceID hid, int3 dst, ui8 instant, TPlaye
&& complain("Cannot disembark hero, tile is blocked!"))
|| ( (distance(h->pos, dst) >= 1.5 && !instant)
&& complain("Tiles are not neighboring!"))
|| ( (h->inTownGarrison)
&& complain("Can not move garrisoned hero!"))
|| ((h->movement < cost && dst != h->pos && !instant)
&& complain("Hero doesn't have any movement points left!"))
|| (states.checkFlag(h->tempOwner, &PlayerStatus::engagedIntoBattle)