diff options
| -rw-r--r-- | src/actions/target.cpp | 4 | ||||
| -rw-r--r-- | src/actormanager.cpp | 6 | ||||
| -rw-r--r-- | src/being/being.cpp | 14 | ||||
| -rw-r--r-- | src/enums/being/actortype.h | 4 | ||||
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 3 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 8 | ||||
| -rw-r--r-- | src/gui/windows/minimap.cpp | 6 |
7 files changed, 35 insertions, 10 deletions
diff --git a/src/actions/target.cpp b/src/actions/target.cpp index e01871cdb..7195f5d0c 100644 --- a/src/actions/target.cpp +++ b/src/actions/target.cpp @@ -70,12 +70,16 @@ impHandler0(targetNPC) impHandler0(targetMercenary) { +#ifdef EATHENA_SUPPORT return setTarget(ActorType::Mercenary, true); +#endif } impHandler0(targetPet) { +#ifdef EATHENA_SUPPORT return setTarget(ActorType::Pet, true); +#endif } impHandler0(contextMenu) diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 2367f8fd4..7a074661d 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -247,9 +247,11 @@ Being *ActorManager::createBeing(const int id, mActors.insert(being); if (type == ActorType::Player - || type == ActorType::Npc +#ifdef EATHENA_SUPPORT || type == ActorType::Mercenary - || type == ActorType::Pet) + || type == ActorType::Pet +#endif + || type == ActorType::Npc) { being->updateFromCache(); beingHandler->requestNameById(id); diff --git a/src/being/being.cpp b/src/being/being.cpp index af989ff65..523d19331 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -236,9 +236,12 @@ Being::Being(const int id, setSubtype(subtype, 0); if (mType == ActorType::Player +#ifdef EATHENA_SUPPORT || mType == ActorType::Mercenary || mType == ActorType::Pet - || mType == ActorType::Homunculus) + || mType == ActorType::Homunculus +#endif + ) { mShowName = config.getBoolValue("visiblenames"); } @@ -332,6 +335,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look) mYDiff = mInfo->getSortOffsetY(); } } +#ifdef EATHENA_SUPPORT if (mType == ActorType::Pet) { mInfo = PETDB::get(mSubType); @@ -365,6 +369,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look) mYDiff = mInfo->getSortOffsetY(); } } +#endif else if (mType == ActorType::Npc) { mInfo = NPCDB::get(mSubType); @@ -612,9 +617,12 @@ void Being::takeDamage(Being *const attacker, } } else if (mType == ActorType::Monster +#ifdef EATHENA_SUPPORT || mType == ActorType::Mercenary || mType == ActorType::Pet - || mType == ActorType::Homunculus) + || mType == ActorType::Homunculus +#endif + ) { if (attacker == localPlayer) { @@ -3055,9 +3063,11 @@ std::string Being::loadComment(const std::string &name, case ActorType::Portal: case ActorType::LocalPet: case ActorType::Avatar: +#ifdef EATHENA_SUPPORT case ActorType::Mercenary: case ActorType::Homunculus: case ActorType::Pet: +#endif default: return ""; } diff --git a/src/enums/being/actortype.h b/src/enums/being/actortype.h index c6123a7f4..c9e39e1f7 100644 --- a/src/enums/being/actortype.h +++ b/src/enums/being/actortype.h @@ -33,10 +33,12 @@ namespace ActorType FloorItem, Portal, LocalPet, - Pet, Avatar, +#ifdef EATHENA_SUPPORT + Pet, Mercenary, Homunculus +#endif }; } // namespace ActorType diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 5ef07eb69..a458cf17d 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -307,6 +307,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) break; } +#ifdef EATHENA_SUPPORT case ActorType::Mercenary: // TRANSLATORS: popup menu item // TRANSLATORS: Mercenary move to master @@ -355,7 +356,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) mBrowserBox->addRow("##3---"); } break; - +#endif case ActorType::Avatar: case ActorType::Unknown: case ActorType::FloorItem: diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 2871bcb65..fd9166c33 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -777,10 +777,12 @@ void Viewport::mouseMoved(MouseEvent &event) if (mHoverBeing && (type == ActorType::Player || type == ActorType::Npc +#ifdef EATHENA_SUPPORT || type == ActorType::Homunculus || type == ActorType::Mercenary - || type == ActorType::LocalPet - || type == ActorType::Pet)) + || type == ActorType::Pet +#endif + || type == ActorType::LocalPet)) { popupManager->hideTextPopup(); if (mShowBeingPopup && beingPopup) @@ -837,9 +839,11 @@ void Viewport::mouseMoved(MouseEvent &event) case ActorType::Monster: case ActorType::Portal: case ActorType::LocalPet: +#ifdef EATHENA_SUPPORT case ActorType::Pet: case ActorType::Mercenary: case ActorType::Homunculus: +#endif gui->setCursorType(mHoverBeing->getHoverCursor()); break; diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 8fcb175ef..64c69b1e1 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -332,10 +332,12 @@ void Minimap::draw(Graphics *graphics) break; case ActorType::LocalPet: +#ifdef EATHENA_SUPPORT case ActorType::Pet: +#endif type = UserPalette::PET; break; - +#ifdef EATHENA_SUPPORT case ActorType::Mercenary: type = UserPalette::MERCENARY; break; @@ -343,7 +345,7 @@ void Minimap::draw(Graphics *graphics) case ActorType::Homunculus: type = UserPalette::HOMUNCULUS; break; - +#endif case ActorType::Avatar: case ActorType::Unknown: case ActorType::Player: |