diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-04 01:58:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-08-04 01:58:51 +0300 |
| commit | f2013e1e567d2a91be8b696cdd1db3edd5906f99 (patch) | |
| tree | 20d0288ea17f2da33b4887f0e8734063ca7134a5 /src/gui | |
| parent | f74e2b6c8b019bceb02e25aa53e988918fd5d278 (diff) | |
| download | mv-f2013e1e567d2a91be8b696cdd1db3edd5906f99.tar.gz mv-f2013e1e567d2a91be8b696cdd1db3edd5906f99.tar.bz2 mv-f2013e1e567d2a91be8b696cdd1db3edd5906f99.tar.xz mv-f2013e1e567d2a91be8b696cdd1db3edd5906f99.zip | |
Add some missing tmwa defines. Fix compilation error without tmwa support.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/viewport.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/avatarlistbox.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 3a61e0f65..e476e4b38 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -440,8 +440,11 @@ bool Viewport::leftMouseAction() validateSpeed(); if (actorManager) { +#ifdef TMWA_SUPPORT if (localPlayer != mHoverBeing || mSelfMouseHeal) actorManager->heal(mHoverBeing); +#endif // TMWA_SUPPORT + if (localPlayer == mHoverBeing && mHoverItem) localPlayer->pickUp(mHoverItem); return true; @@ -484,7 +487,9 @@ bool Viewport::leftMouseAction() case ActorType::Elemental: break; case ActorType::Unknown: +#ifdef TMWA_SUPPORT case ActorType::LocalPet: +#endif case ActorType::Avatar: default: reportAlways("Left click on unknown actor type: %d", diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 9919a10d3..e4c5d3e93 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -613,6 +613,7 @@ void AvatarListBox::mousePressed(MouseEvent &event) const MouseButtonT eventButton = event.getButton(); if (eventButton == MouseButton::LEFT) { +#ifdef TMWA_SUPPORT if (type == MapItemType::EMPTY) { const Being *const being = actorManager->findBeingByName( @@ -621,6 +622,7 @@ void AvatarListBox::mousePressed(MouseEvent &event) actorManager->heal(being); } else +#endif // TMWA_SUPPORT { localPlayer->navigateTo(ava->getX(), ava->getY()); } |