fix scroll, container item size, tradewindow scroll, questlog window alignment, stop attacking same creature

This commit is contained in:
Henrique Santiago
2012-06-03 17:05:35 -03:00
parent e4cb9b27db
commit fda3ae6809
6 changed files with 71 additions and 44 deletions

View File

@@ -691,9 +691,14 @@ void Game::refreshContainer()
void Game::attack(const CreaturePtr& creature)
{
if(!canPerformGameAction() || creature == m_localPlayer || creature == m_attackingCreature)
if(!canPerformGameAction() || creature == m_localPlayer)
return;
if(creature == m_attackingCreature) {
cancelAttack();
return;
}
m_localPlayer->lockWalk();
if(creature && isFollowing())
@@ -1106,4 +1111,4 @@ void Game::setFollowingCreature(const CreaturePtr& creature)
m_followingCreature = creature;
g_lua.callGlobalField("g_game", "onFollowingCreatureChange", creature, oldCreature);
}
}