Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-12-21 07:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix autowalk sometimes not being canceled

Browse Source
This commit is contained in:
Eduardo Bart
2013-01-31 00:50:20 -02:00
parent 1bf77c35c6
commit 654f71e75f
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/game.cpp
View File

@@ -533,9 +533,11 @@ bool Game::walk(Otc::Direction direction)
if(isFollowing())
cancelFollow();
// must cancel auto walking and wait next try
if(m_localPlayer->isAutoWalking()) {
// must cancel auto walking, and wait next try
if(m_localPlayer->isAutoWalking() || m_localPlayer->isServerWalking()) {
m_protocolGame->sendStop();
if(m_localPlayer->isAutoWalking())
m_localPlayer->stopAutoWalk();
return false;
}
@@ -558,10 +560,10 @@ bool Game::walk(Otc::Direction direction)
Position toPos = m_localPlayer->getPosition().translatedToDirection(direction);
TilePtr toTile = g_map.getTile(toPos);
// only do prewalks to walkable tiles (like grounds and not walls)
if(toTile && toTile->isWalkable())
if(toTile && toTile->isWalkable()) {
m_localPlayer->preWalk(direction);
// check walk to another floor (e.g: when above 3 parcels)
else {
} else {
// check if can walk to a lower floor
auto canChangeFloorDown = [&]() -> bool {
Position pos = toPos;