Remove lockWalks from game
This commit is contained in:
parent
d939ade06d
commit
fa27210d7f
|
@ -630,8 +630,6 @@ void Game::move(const ThingPtr& thing, const Position& toPos, int count)
|
||||||
if(!canPerformGameAction() || !thing || thing->getPosition() == toPos)
|
if(!canPerformGameAction() || !thing || thing->getPosition() == toPos)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_localPlayer->lockWalk();
|
|
||||||
|
|
||||||
uint id = thing->getId();
|
uint id = thing->getId();
|
||||||
if(thing->isCreature()) {
|
if(thing->isCreature()) {
|
||||||
CreaturePtr creature = thing->static_self_cast<Creature>();
|
CreaturePtr creature = thing->static_self_cast<Creature>();
|
||||||
|
@ -667,8 +665,6 @@ void Game::use(const ThingPtr& thing)
|
||||||
if(!pos.isValid()) // virtual item
|
if(!pos.isValid()) // virtual item
|
||||||
pos = Position(0xFFFF, 0, 0); // means that is a item in inventory
|
pos = Position(0xFFFF, 0, 0); // means that is a item in inventory
|
||||||
|
|
||||||
m_localPlayer->lockWalk();
|
|
||||||
|
|
||||||
m_protocolGame->sendUseItem(pos, thing->getId(), thing->getStackpos(), 0);
|
m_protocolGame->sendUseItem(pos, thing->getId(), thing->getStackpos(), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -678,7 +674,6 @@ void Game::useInventoryItem(int itemId)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Position pos = Position(0xFFFF, 0, 0); // means that is a item in inventory
|
Position pos = Position(0xFFFF, 0, 0); // means that is a item in inventory
|
||||||
m_localPlayer->lockWalk();
|
|
||||||
|
|
||||||
m_protocolGame->sendUseItem(pos, itemId, 0, 0);
|
m_protocolGame->sendUseItem(pos, itemId, 0, 0);
|
||||||
}
|
}
|
||||||
|
@ -692,8 +687,6 @@ void Game::useWith(const ItemPtr& item, const ThingPtr& toThing)
|
||||||
if(!pos.isValid()) // virtual item
|
if(!pos.isValid()) // virtual item
|
||||||
pos = Position(0xFFFF, 0, 0); // means that is a item in inventory
|
pos = Position(0xFFFF, 0, 0); // means that is a item in inventory
|
||||||
|
|
||||||
m_localPlayer->lockWalk();
|
|
||||||
|
|
||||||
if(toThing->isCreature())
|
if(toThing->isCreature())
|
||||||
m_protocolGame->sendUseOnCreature(pos, item->getId(), item->getStackpos(), toThing->getId());
|
m_protocolGame->sendUseOnCreature(pos, item->getId(), item->getStackpos(), toThing->getId());
|
||||||
else
|
else
|
||||||
|
@ -705,8 +698,6 @@ void Game::useInventoryItemWith(int itemId, const ThingPtr& toThing)
|
||||||
if(!canPerformGameAction() || !toThing)
|
if(!canPerformGameAction() || !toThing)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_localPlayer->lockWalk();
|
|
||||||
|
|
||||||
Position pos = Position(0xFFFF, 0, 0); // means that is a item in inventory
|
Position pos = Position(0xFFFF, 0, 0); // means that is a item in inventory
|
||||||
|
|
||||||
if(toThing->isCreature())
|
if(toThing->isCreature())
|
||||||
|
@ -765,8 +756,6 @@ void Game::attack(const CreaturePtr& creature)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_localPlayer->lockWalk();
|
|
||||||
|
|
||||||
if(creature && isFollowing())
|
if(creature && isFollowing())
|
||||||
cancelFollow();
|
cancelFollow();
|
||||||
|
|
||||||
|
@ -791,8 +780,6 @@ void Game::cancelAttackAndFollow()
|
||||||
if(!canPerformGameAction())
|
if(!canPerformGameAction())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_localPlayer->lockWalk();
|
|
||||||
|
|
||||||
if(isAttacking())
|
if(isAttacking())
|
||||||
setAttackingCreature(nullptr);
|
setAttackingCreature(nullptr);
|
||||||
if(isFollowing())
|
if(isFollowing())
|
||||||
|
|
Loading…
Reference in New Issue