diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-07-29 03:12:26 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-07-29 03:12:26 +0300 |
| commit | 448ff09baf47387c9cfb6919028b1d4bbe2c8f0b (patch) | |
| tree | 35258d1b669dd6fa83d0a4d21792337c6f6c228d /src/gui | |
| parent | 9993fbc1d1bec556143d974f148869e1fb4c6307 (diff) | |
| download | mv-448ff09baf47387c9cfb6919028b1d4bbe2c8f0b.tar.gz mv-448ff09baf47387c9cfb6919028b1d4bbe2c8f0b.tar.bz2 mv-448ff09baf47387c9cfb6919028b1d4bbe2c8f0b.tar.xz mv-448ff09baf47387c9cfb6919028b1d4bbe2c8f0b.zip | |
Add some missing tmwa defines.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 4 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 8 | ||||
| -rw-r--r-- | src/gui/windows/minimap.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/serverdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/textcommandeditor.cpp | 2 |
5 files changed, 14 insertions, 4 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index e74873a10..2e153b0a8 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -430,7 +430,9 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) case ActorType::Unknown: case ActorType::FloorItem: case ActorType::Portal: +#ifdef TMWA_SUPPORT case ActorType::LocalPet: +#endif default: break; } @@ -3194,7 +3196,9 @@ void PopupMenu::showGMPopup(const std::string &name) showItemGMCommands(); break; case ActorType::Portal: +#ifdef TMWA_SUPPORT case ActorType::LocalPet: +#endif case ActorType::Avatar: break; } diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index a543f53bd..ab3d31588 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -835,8 +835,10 @@ void Viewport::mouseMoved(MouseEvent &event) || type == ActorType::Npc || type == ActorType::Homunculus || type == ActorType::Mercenary - || type == ActorType::Pet - || type == ActorType::LocalPet)) +#ifdef TMWA_SUPPORT + || type == ActorType::LocalPet +#endif + || type == ActorType::Pet)) { popupManager->hideTextPopup(); if (mShowBeingPopup && beingPopup) @@ -892,7 +894,9 @@ void Viewport::mouseMoved(MouseEvent &event) case ActorType::Npc: case ActorType::Monster: case ActorType::Portal: +#ifdef TMWA_SUPPORT case ActorType::LocalPet: +#endif case ActorType::Pet: case ActorType::Mercenary: case ActorType::Homunculus: diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index e149f06e8..606b1ce7e 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -351,7 +351,9 @@ void Minimap::draw2(Graphics *const graphics) type = UserColorId::PORTAL_HIGHLIGHT; break; +#ifdef TMWA_SUPPORT case ActorType::LocalPet: +#endif case ActorType::Pet: type = UserColorId::PET; break; diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 6d9992cab..5299d4fd1 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -80,9 +80,7 @@ static uint16_t defaultPortForServerType(const ServerTypeT type) case ServerType::EVOL2: return 6900; case ServerType::UNKNOWN: -#ifdef TMWA_SUPPORT case ServerType::TMWATHENA: -#endif return 6901; } } diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index 5c59cd389..2e31ca80f 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -42,7 +42,9 @@ #include "debug.h" +#ifdef TMWA_SUPPORT const unsigned int MAGIC_START_ID = 340; +#endif TextCommandEditor::TextCommandEditor(TextCommand *const command) : // TRANSLATORS: command editor name |