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

CPlayerInterface: don't stop hero movement on embark / disembark

Browse Source 
When hero have free boarding bonus there no reason to stop movement.
This commit is contained in:
Arseniy Shestakov 2017-09-16 10:42:27 +03:00
parent 1162923d93
commit ae13123129
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/CPlayerInterface.cpp
View File

@ -308,7 +308,7 @@ void CPlayerInterface::heroMoved(const TryMoveHero & details)
} }
} }
if (details.result != TryMoveHero::SUCCESS) //hero failed to move if(details.stopMovement()) //hero failed to move
{ {
hero->isStanding = true; hero->isStanding = true;
stillMoveHero.setn(STOP_MOVE); stillMoveHero.setn(STOP_MOVE);

5
client/NetPacksClient.cpp
View File

@ -420,6 +420,11 @@ void TryMoveHero::applyCl(CClient *cl)
CGI->mh->printObject(h); CGI->mh->printObject(h);
} }
bool TryMoveHero::stopMovement() const
{
return result != SUCCESS && result != EMBARK && result != DISEMBARK && result != TELEPORTATION;
}
void NewStructures::applyCl(CClient *cl) void NewStructures::applyCl(CClient *cl)
{ {
CGTownInstance *town = GS(cl)->getTown(tid); CGTownInstance *town = GS(cl)->getTown(tid);

2
lib/NetPacks.h
View File

@ -634,6 +634,8 @@ struct TryMoveHero : public CPackForClient
bool humanKnows; //used locally during applying to client bool humanKnows; //used locally during applying to client
bool stopMovement() const;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & id; h & id;