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

Fixed paths through teleport, formatting cleanup

Browse Source
This commit is contained in:
Ivan Savenko
2023-09-16 20:07:02 +03:00
parent f08028a158
commit b7de685483
4 changed files with 151 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/HeroMovementController.h
View File

@@ -1,5 +1,5 @@
/*
* CPlayerInterface.h, part of VCMI engine
* HeroMovementController.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
@@ -32,15 +32,12 @@ class HeroMovementController
/// movement was requested to be terminated, e.g. by player or due to inability to move
bool stoppingMovement = false;
bool waitingForQueryApplyReply = false;
const CGHeroInstance * currentlyMovingHero = nullptr;
AudioPath currentMovementSoundName;
int currentMovementSoundChannel = -1;
/// return final node in a path, if exists
std::optional<int3> getLastTile(const CGHeroInstance * h) const;
/// return first path in a path, if exists
std::optional<int3> getNextTile(const CGHeroInstance * h) const;
bool canHeroStopAtNode(const CGPathNode & node) const;
void updatePath(const CGHeroInstance * hero, const TryMoveHero & details);
@@ -56,11 +53,16 @@ class HeroMovementController
public:
// const queries
/// Returns true if hero should move through garrison without displaying garrison dialog
bool isHeroMovingThroughGarrison(const CGHeroInstance * hero, const CArmedInstance * garrison) const;
/// Returns true if there is an ongoing hero movement process
bool isHeroMoving() const;
// netpack handlers
void onMoveHeroApplied();
void onQueryReplyApplied();
void onPlayerTurnStarted();
void onBattleStarted();
void showTeleportDialog(const CGHeroInstance * hero, TeleportChannelID channel, TTeleportExitsList exits, bool impassable, QueryID askID);