gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Look (#818) 

sendLookCreature should only be called in battleList
This commit is contained in:
Joao Pasqualini Costa 2017-02-02 05:59:20 -02:00 committed by Ahmed Samy
parent 0676b68493
commit 2292df922d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/game_battle/battle.lua
View File

@ -484,10 +484,10 @@ function onBattleButtonMouseRelease(self, mousePosition, mouseButton)
if ((g_mouse.isPressed(MouseLeftButton) and mouseButton == MouseRightButton) if ((g_mouse.isPressed(MouseLeftButton) and mouseButton == MouseRightButton)
or (g_mouse.isPressed(MouseRightButton) and mouseButton == MouseLeftButton)) then or (g_mouse.isPressed(MouseRightButton) and mouseButton == MouseLeftButton)) then
mouseWidget.cancelNextRelease = true mouseWidget.cancelNextRelease = true
g_game.look(self.creature) g_game.look(self.creature, true)
return true return true
elseif mouseButton == MouseLeftButton and g_keyboard.isShiftPressed() then elseif mouseButton == MouseLeftButton and g_keyboard.isShiftPressed() then
g_game.look(self.creature) g_game.look(self.creature, true)
return true return true
elseif mouseButton == MouseRightButton and not g_mouse.isPressed(MouseLeftButton) then elseif mouseButton == MouseRightButton and not g_mouse.isPressed(MouseLeftButton) then
modules.game_interface.createThingMenu(mousePosition, nil, nil, self.creature) modules.game_interface.createThingMenu(mousePosition, nil, nil, self.creature)

4
src/client/game.cpp
View File

@ -778,12 +778,12 @@ void Game::stop()
m_protocolGame->sendStop(); m_protocolGame->sendStop();
} }
void Game::look(const ThingPtr& thing) void Game::look(const ThingPtr& thing, bool isBattleList)
{ {
if(!canPerformGameAction() || !thing) if(!canPerformGameAction() || !thing)
return; return;
if(thing->isCreature() && m_protocolVersion >= 961) if(thing->isCreature() && isBattleList && m_protocolVersion >= 961)
m_protocolGame->sendLookCreature(thing->getId()); m_protocolGame->sendLookCreature(thing->getId());
else else
m_protocolGame->sendLook(thing->getPosition(), thing->getId(), thing->getStackPos()); m_protocolGame->sendLook(thing->getPosition(), thing->getId(), thing->getStackPos());

2
src/client/game.h
View File

@ -173,7 +173,7 @@ public:
void stop(); void stop();
// item related // item related
void look(const ThingPtr& thing); void look(const ThingPtr& thing, bool isBattleList = false);
void move(const ThingPtr &thing, const Position& toPos, int count); void move(const ThingPtr &thing, const Position& toPos, int count);
void moveToParentContainer(const ThingPtr& thing, int count); void moveToParentContainer(const ThingPtr& thing, int count);
void rotate(const ThingPtr& thing); void rotate(const ThingPtr& thing);