diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-07-28 16:03:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-07-28 16:34:59 +0300 |
| commit | b96e6eeba6e1511568c8291bd8cb6a6d3706635c (patch) | |
| tree | d021843c88d856f86f018547c30f1181290ffcbe | |
| parent | 60859a71dd9794b0216cc7a60146d417e06dbbad (diff) | |
| download | mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.gz mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.bz2 mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.xz mv-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.zip | |
Remove define EATHENA_SUPPORT from all code.
Now eathena like support enabled always.
130 files changed, 11 insertions, 783 deletions
diff --git a/src/actions/actiondef.h b/src/actions/actiondef.h index 02dc6ab05..18c276e3c 100644 --- a/src/actions/actiondef.h +++ b/src/actions/actiondef.h @@ -30,12 +30,7 @@ SETTINGS_H INPUT_INPUTMANAGER_H #define impHandler(name) bool name(InputEvent &event) - -#ifdef EATHENA_SUPPORT #define impHandlerE(name) bool name(InputEvent &event) -#else // EATHENA_SUPPORT -#define impHandlerE(name) bool name(InputEvent &event A_UNUSED) -#endif // EATHENA_SUPPORT #define impHandler0(name) bool name(InputEvent &event A_UNUSED) #define impHandlerVoid(name) bool name(InputEvent &event A_UNUSED) \ diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 615c081b3..6ad192223 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -78,20 +78,16 @@ #include "net/adminhandler.h" #include "net/beinghandler.h" -#ifdef EATHENA_SUPPORT #include "net/buyingstorehandler.h" -#endif #include "net/buysellhandler.h" #include "net/chathandler.h" #include "net/download.h" #include "net/gamehandler.h" #include "net/inventoryhandler.h" #include "net/ipc.h" -#ifdef EATHENA_SUPPORT #include "net/mercenaryhandler.h" #include "net/net.h" #include "net/vendinghandler.h" -#endif #include "net/npchandler.h" #include "net/playerhandler.h" #include "net/serverfeatures.h" @@ -261,12 +257,10 @@ static Item *getItemByInvIndex(const InputEvent &event, break; case InventoryType::Trade: case InventoryType::Npc: -#ifdef EATHENA_SUPPORT case InventoryType::Cart: case InventoryType::Vending: case InventoryType::Mail: case InventoryType::Craft: -#endif case InventoryType::TypeEnd: default: break; @@ -507,10 +501,8 @@ impHandler(dropItemInvAll) impHandler(heal) { -#ifdef EATHENA_SUPPORT if (Net::getNetworkType() != ServerType::TMWATHENA) return false; -#endif if (actorManager && localPlayer) { std::string args = event.args; @@ -560,10 +552,8 @@ impHandler(heal) impHandler0(healmd) { -#ifdef EATHENA_SUPPORT if (Net::getNetworkType() != ServerType::TMWATHENA) return false; -#endif if (actorManager) { const int matk = PlayerInfo::getStatEffective(Attributes::PLAYER_MATK); @@ -593,10 +583,8 @@ impHandler0(healmd) impHandler0(itenplz) { -#ifdef EATHENA_SUPPORT if (Net::getNetworkType() != ServerType::TMWATHENA) return false; -#endif if (actorManager) { if (playerHandler && @@ -622,10 +610,8 @@ impHandler0(setHome) impHandler0(magicAttack) { -#ifdef EATHENA_SUPPORT if (Net::getNetworkType() != ServerType::TMWATHENA) return false; -#endif if (localPlayer) { localPlayer->magicAttack(); @@ -729,12 +715,9 @@ impHandler(buy) } else if (being->getType() == ActorType::Player) { -#ifdef EATHENA_SUPPORT if (vendingHandler && serverFeatures->haveVending()) vendingHandler->open(being); - else -#endif - if (buySellHandler) + else if (buySellHandler) buySellHandler->requestSellList(being->getName()); return true; } @@ -778,12 +761,9 @@ impHandler(sell) } else if (being->getType() == ActorType::Player) { -#ifdef EATHENA_SUPPORT if (buyingStoreHandler && serverFeatures->haveVending()) buyingStoreHandler->open(being); - else -#endif - if (buySellHandler) + else if (buySellHandler) buySellHandler->requestBuyList(being->getName()); return true; } @@ -1529,13 +1509,9 @@ impHandler(uploadLog) impHandler0(mercenaryFire) { -#ifdef EATHENA_SUPPORT if (mercenaryHandler) mercenaryHandler->fire(); return true; -#else - return false; -#endif } impHandler(useItem) @@ -1703,7 +1679,6 @@ impHandler0(testInfo) impHandlerE(craftKey) { -#ifdef EATHENA_SUPPORT const int slot = (event.action - InputAction::CRAFT_1); if (slot >= 0 && slot < 9) { @@ -1711,7 +1686,6 @@ impHandlerE(craftKey) inventoryWindow->moveItemToCraft(slot); return true; } -#endif return false; } @@ -1805,7 +1779,6 @@ impHandler(setEmoteType) { settings.emoteType = EmoteType::Pet; } -#ifdef EATHENA_SUPPORT else if (args == "homun" || args == "homunculus") { settings.emoteType = EmoteType::Homunculus; @@ -1814,7 +1787,6 @@ impHandler(setEmoteType) { settings.emoteType = EmoteType::Mercenary; } -#endif return true; } diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index 98db8d57f..4699aabd7 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -30,20 +30,16 @@ #include "being/flooritem.h" #include "being/localplayer.h" #include "being/playerrelations.h" -#ifdef EATHENA_SUPPORT #include "being/homunculusinfo.h" #include "being/playerinfo.h" -#endif #include "gui/viewport.h" #include "gui/popups/popupmenu.h" -#ifdef EATHENA_SUPPORT #include "gui/shortcut/emoteshortcut.h" #include "gui/windows/mailwindow.h" -#endif #include "gui/windows/chatwindow.h" #include "gui/windows/inventorywindow.h" @@ -56,19 +52,15 @@ #include "input/inputactionoperators.h" -#ifdef EATHENA_SUPPORT #include "listeners/inputactionreplaylistener.h" -#endif #include "net/adminhandler.h" #include "net/chathandler.h" #include "net/guildhandler.h" -#ifdef EATHENA_SUPPORT #include "net/familyhandler.h" #include "net/homunculushandler.h" #include "net/mailhandler.h" #include "net/net.h" -#endif #include "net/npchandler.h" #include "net/partyhandler.h" #include "net/serverfeatures.h" @@ -556,7 +548,6 @@ impHandler(imitation) impHandler(sendMail) { -#ifdef EATHENA_SUPPORT const ServerTypeT type = Net::getNetworkType(); if (type == ServerType::EATHENA || type == ServerType::EVOL2) { @@ -569,9 +560,7 @@ impHandler(sendMail) mailHandler->send(name, _("Quick message"), text); } } - else -#endif - if (serverConfig.getBoolValue("enableManaMarketBot")) + else if (serverConfig.getBoolValue("enableManaMarketBot")) { chatHandler->privateMessage("ManaMarket", "!mail " + event.args); return true; @@ -909,7 +898,6 @@ impHandler(serverUnIgnoreWhisper) impHandlerE(setHomunculusName) { -#ifdef EATHENA_SUPPORT const std::string args = event.args; if (args.empty()) { @@ -929,19 +917,16 @@ impHandlerE(setHomunculusName) homunculusHandler->setName(args); return true; } -#endif return false; } impHandler0(fireHomunculus) { -#ifdef EATHENA_SUPPORT if (homunculusHandler) { homunculusHandler->fire(); return true; } -#endif return false; } @@ -973,7 +958,6 @@ impHandler(warp) impHandlerE(homunTalk) { -#ifdef EATHENA_SUPPORT if (!serverFeatures || !serverFeatures->haveTalkPet()) return false; @@ -985,13 +969,11 @@ impHandlerE(homunTalk) homunculusHandler->talk(args); return true; } -#endif return false; } impHandlerE(homunEmote) { -#ifdef EATHENA_SUPPORT if (!serverFeatures || !serverFeatures->haveTalkPet()) return false; @@ -1006,14 +988,12 @@ impHandlerE(homunEmote) Game::instance()->setValidSpeed(); return true; } -#endif return false; } impHandlerE(commandHomunEmote) { -#ifdef EATHENA_SUPPORT if (!serverFeatures || !serverFeatures->haveTalkPet()) return false; @@ -1023,25 +1003,19 @@ impHandlerE(commandHomunEmote) atoi(event.args.c_str()))); return true; } -#endif return false; } impHandlerE(createPublicChatRoom) { -#ifdef EATHENA_SUPPORT if (!chatHandler || event.args.empty()) return false; chatHandler->createChatRoom(event.args, "", 100, true); return true; -#else - return false; -#endif } impHandlerE(joinChatRoom) { -#ifdef EATHENA_SUPPORT if (!chatHandler) return false; const std::string args = event.args; @@ -1052,20 +1026,15 @@ impHandlerE(joinChatRoom) return false; chatHandler->joinChat(chat, ""); return true; -#else - return false; -#endif } impHandler0(leaveChatRoom) { -#ifdef EATHENA_SUPPORT if (chatHandler) { chatHandler->leaveChatRoom(); return true; } -#endif return false; } @@ -1187,16 +1156,12 @@ impHandler(skill) impHandlerE(craft) { -#ifdef EATHENA_SUPPORT const std::string args = event.args; if (args.empty() || !inventoryWindow) return false; inventoryWindow->moveItemToCraft(atoi(args.c_str())); return true; -#else - return false; -#endif } impHandler(npcClipboard) @@ -1597,19 +1562,14 @@ impHandler(commandGuildRecall) impHandlerE(mailTo) { -#ifdef EATHENA_SUPPORT if (!mailWindow) return false; mailWindow->createMail(event.args); return true; -#else - return false; -#endif } impHandlerE(adoptChild) { -#ifdef EATHENA_SUPPORT const std::string nick = getNick(event); Being *const being = actorManager->findBeingByName( nick, ActorType::Player); @@ -1617,9 +1577,6 @@ impHandlerE(adoptChild) return true; familyHandler->askForChild(being); return true; -#else - return false; -#endif } impHandler(showSkillLevels) diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp index 512ef00d0..0aa0f29be 100644 --- a/src/actions/pets.cpp +++ b/src/actions/pets.cpp @@ -68,14 +68,10 @@ static const Being *getPet() return *pets.begin(); } #endif -#ifdef EATHENA_SUPPORT const BeingId id = PlayerInfo::getPetBeingId(); if (id == BeingId_zero) return nullptr; return actorManager->findBeing(id); -#else - return nullptr; -#endif } impHandler(commandEmotePet) diff --git a/src/actions/target.cpp b/src/actions/target.cpp index 4e0b46cd3..483fdffcb 100644 --- a/src/actions/target.cpp +++ b/src/actions/target.cpp @@ -60,29 +60,17 @@ impHandler0(targetNPC) impHandler0(targetMercenary) { -#ifdef EATHENA_SUPPORT return setTarget(ActorType::Mercenary, AllowSort_true); -#else - return false; -#endif } impHandler0(targetSkillUnit) { -#ifdef EATHENA_SUPPORT return setTarget(ActorType::SkillUnit, AllowSort_true); -#else - return false; -#endif } impHandler0(targetPet) { -#ifdef EATHENA_SUPPORT return setTarget(ActorType::Pet, AllowSort_true); -#else - return false; -#endif } impHandler0(contextMenu) diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp index 508f17105..4febc871a 100644 --- a/src/actions/windows.cpp +++ b/src/actions/windows.cpp @@ -22,15 +22,11 @@ #include "actions/actiondef.h" -#ifdef EATHENA_SUPPORT #include "being/localplayer.h" -#endif #include "gui/dialogsmanager.h" -#ifdef EATHENA_SUPPORT #include "gui/windows/bankwindow.h" -#endif #include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" #include "gui/windows/statuswindow.h" @@ -55,9 +51,7 @@ #include "utils/gettext.h" -#ifdef EATHENA_SUPPORT #include "net/serverfeatures.h" -#endif #include "debug.h" @@ -272,20 +266,15 @@ impHandler0(questsWindowShow) impHandler0(bankWindowShow) { -#ifdef EATHENA_SUPPORT if (!serverFeatures || !serverFeatures->haveBankApi()) return false; showHideWindow(bankWindow); return true; -#else - return false; -#endif } impHandler0(cartWindowShow) { -#ifdef EATHENA_SUPPORT if (!serverFeatures || !serverFeatures->haveCart() || !localPlayer || @@ -298,9 +287,6 @@ impHandler0(cartWindowShow) if (inventoryWindow) inventoryWindow->updateDropButton(); return true; -#else - return false; -#endif } impHandler0(updaterWindowShow) @@ -329,12 +315,8 @@ impHandler0(quickWindowShow) impHandler0(mailWindowShow) { -#ifdef EATHENA_SUPPORT showHideWindow(mailWindow); return true; -#else - return false; -#endif } } // namespace Actions diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 4edd23476..e2bb85eb5 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -199,9 +199,7 @@ ActorManager::ActorManager() : mActorsIdMap(), mIdName(), mBlockedBeings(), -#ifdef EATHENA_SUPPORT mChars(), -#endif mMap(nullptr), mSpellHeal1(serverConfig.getValue("spellHeal1", "#lum")), mSpellHeal2(serverConfig.getValue("spellHeal2", "#inma")), @@ -277,11 +275,9 @@ Being *ActorManager::createBeing(const BeingId id, mActorsIdMap[being->getId()] = being; if (type == ActorType::Player -#ifdef EATHENA_SUPPORT || type == ActorType::Mercenary || type == ActorType::Pet || type == ActorType::Homunculus -#endif || type == ActorType::Npc) { being->updateFromCache(); @@ -592,12 +588,10 @@ void ActorManager::findBeingsByPixel(std::vector<ActorSprite*> &beings, case ActorType::Npc: case ActorType::Monster: case ActorType::LocalPet: -#ifdef EATHENA_SUPPORT case ActorType::Pet: case ActorType::Mercenary: case ActorType::Homunculus: case ActorType::SkillUnit: -#endif { const Being *const being = static_cast<const Being*>(*it); if (!being) @@ -1003,9 +997,7 @@ void ActorManager::clear() mActorsIdMap[localPlayer->getId()] = localPlayer; } -#ifdef EATHENA_SUPPORT mChars.clear(); -#endif } Being *ActorManager::findNearestPvpPlayer() const @@ -1391,10 +1383,8 @@ void ActorManager::healTarget() const void ActorManager::heal(const Being *const target) const { -#ifdef EATHENA_SUPPORT if (Net::getNetworkType() != ServerType::TMWATHENA) return; -#endif if (!localPlayer || !chatWindow || @@ -1517,10 +1507,8 @@ Being* ActorManager::findMostDamagedPlayer(const int maxTileDist) const void ActorManager::itenplz() const { -#ifdef EATHENA_SUPPORT if (Net::getNetworkType() != ServerType::TMWATHENA) return; -#endif if (!localPlayer || !chatWindow || !localPlayer->isAlive() || @@ -2178,7 +2166,6 @@ std::string ActorManager::getSeenPlayerById(const BeingId id) const return std::string(); } -#ifdef EATHENA_SUPPORT void ActorManager::removeRoom(const int chatId) { for_actors @@ -2237,5 +2224,3 @@ void ActorManager::addChar(const int32_t id, guiInput->simulateMouseMove(); } - -#endif diff --git a/src/actormanager.h b/src/actormanager.h index ad53ff729..89d0133c3 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -376,7 +376,6 @@ class ActorManager final: public ConfigListener size_t size() const { return mActors.size(); } -#ifdef EATHENA_SUPPORT void removeRoom(const int chatId); void updateRoom(const ChatObject *const newChat); @@ -385,7 +384,6 @@ class ActorManager final: public ConfigListener void addChar(const int32_t id, const std::string &name); -#endif #ifndef UNITTESTS protected: @@ -413,9 +411,7 @@ class ActorManager final: public ConfigListener ActorSpritesMap mActorsIdMap; IdNameMapping mIdName; std::set<BeingId> mBlockedBeings; -#ifdef EATHENA_SUPPORT std::map<int32_t, std::string> mChars; -#endif Map *mMap; std::string mSpellHeal1; std::string mSpellHeal2; diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index 688bca340..b5eed97d0 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -382,7 +382,6 @@ void ActorSprite::updateStatusEffect(const int32_t index, return; if (effect->mIsPoison && getType() == ActorType::Player) setPoison(newStatus == Enable_true); -#ifdef EATHENA_SUPPORT else if (effect->mIsCart && localPlayer == this) setHaveCart(newStatus == Enable_true); else if (effect->mIsRiding) @@ -391,7 +390,6 @@ void ActorSprite::updateStatusEffect(const int32_t index, setTrickDead(newStatus == Enable_true); else if (effect->mIsPostDelay) stopCast(newStatus == Enable_true); -#endif handleStatusEffect(effect, index, start); } diff --git a/src/being/being.cpp b/src/being/being.cpp index a44870e13..285ed8ca0 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -40,10 +40,8 @@ #include "being/localplayer.h" #include "being/playerinfo.h" #include "being/playerrelations.h" -#ifdef EATHENA_SUPPORT #include "being/homunculusinfo.h" #include "being/mercenaryinfo.h" -#endif // EATHENA_SUPPORT #include "const/utils/timer.h" @@ -145,10 +143,8 @@ static const unsigned int SPEECH_MAX_TIME = 800; #define for_each_badges() \ for (int f = 0; f < BadgeIndex::BadgeIndexSize; f++) -#ifdef EATHENA_SUPPORT #define for_each_horses(name) \ FOR_EACH (std::vector<AnimatedSprite*>::const_iterator, it, name) -#endif Being::Being(const BeingId id, const ActorTypeT type, @@ -205,20 +201,16 @@ Being::Being(const BeingId id, mSpriteHide(new int[20]), mSpriteDraw(new int[20]), mComment(), -#ifdef EATHENA_SUPPORT mBuyBoard(), mSellBoard(), -#endif mPets(), mOwner(nullptr), mSpecialParticle(nullptr), -#ifdef EATHENA_SUPPORT mChat(nullptr), mHorseInfo(nullptr), mDownHorseSprites(), mUpHorseSprites(), mSpiritParticles(), -#endif mX(0), mY(0), mCachedX(0), @@ -250,9 +242,7 @@ Being::Being(const BeingId id, mManner(0), mAreaSize(11), mCastEndTime(0), -#ifdef EATHENA_SUPPORT mCreatorId(BeingId_zero), -#endif mTeamId(0U), mLook(0U), mBadgesCount(0U), @@ -281,12 +271,9 @@ Being::Being(const BeingId id, setSubtype(subtype, 0); if (mType == ActorType::Player -#ifdef EATHENA_SUPPORT || mType == ActorType::Mercenary || mType == ActorType::Pet - || mType == ActorType::Homunculus -#endif - ) + || mType == ActorType::Homunculus) { mShowName = config.getBoolValue("visiblenames"); } @@ -295,12 +282,8 @@ Being::Being(const BeingId id, mGotComment = true; } -#ifdef EATHENA_SUPPORT if (mType == ActorType::Portal || mType == ActorType::SkillUnit) -#else - if (mType == ActorType::Portal) -#endif { mShowName = false; } @@ -340,10 +323,8 @@ Being::~Being() delete2(mAnimationEffect); delete2(mCastingEffect); mBadgesCount = 0; -#ifdef EATHENA_SUPPORT delete2(mChat); removeHorse(); -#endif if (mOwner) { @@ -365,9 +346,7 @@ Being::~Being() mPets.clear(); removeAllItemsParticles(); -#ifdef EATHENA_SUPPORT mSpiritParticles.clear(); -#endif } void Being::createSpeechBubble() restrict2 @@ -401,7 +380,6 @@ void Being::setSubtype(const BeingTypeId subtype, mYDiff = mInfo->getSortOffsetY(); } break; -#ifdef EATHENA_SUPPORT case ActorType::Pet: mInfo = PETDB::get(mSubType); if (mInfo) @@ -450,7 +428,6 @@ void Being::setSubtype(const BeingTypeId subtype, mYDiff = mInfo->getSortOffsetY(); } break; -#endif case ActorType::Npc: mInfo = NPCDB::get(mSubType); if (mInfo) @@ -720,15 +697,11 @@ void Being::takeDamage(Being *restrict const attacker, color = &userPalette->getColor(UserColorId::MISS); } } - else if (mType == ActorType::Monster -#ifdef EATHENA_SUPPORT - || + else if (mType == ActorType::Monster || mType == ActorType::Mercenary || mType == ActorType::Pet || mType == ActorType::Homunculus || - mType == ActorType::SkillUnit -#endif - ) + mType == ActorType::SkillUnit) { if (attacker == localPlayer) { @@ -1592,14 +1565,9 @@ void Being::setAction(const BeingActionT &restrict action, this, false, mX, mY); -#ifdef EATHENA_SUPPORT if (mType == ActorType::Monster || mType == ActorType::Npc || mType == ActorType::SkillUnit) -#else - if (mType == ActorType::Monster || - mType == ActorType::Npc) -#endif { mYDiff = mInfo->getDeadSortOffsetY(); } @@ -1637,12 +1605,10 @@ void Being::setAction(const BeingActionT &restrict action, if (sprite) sprite->play(currentAction); } -#ifdef EATHENA_SUPPORT for_each_horses(mDownHorseSprites) (*it)->play(currentAction); for_each_horses(mUpHorseSprites) (*it)->play(currentAction); -#endif mAction = action; } @@ -1710,12 +1676,10 @@ void Being::setDirection(const uint8_t direction) restrict2 sprite->setSpriteDirection(dir); } -#ifdef EATHENA_SUPPORT for_each_horses(mDownHorseSprites) (*it)->setSpriteDirection(dir); for_each_horses(mUpHorseSprites) (*it)->setSpriteDirection(dir); -#endif recalcSpritesOrder(); } @@ -1821,12 +1785,10 @@ void Being::logic() restrict2 const int time = tick_time * MILLISECONDS_IN_A_TICK; if (mEmotionSprite) mEmotionSprite->update(time); -#ifdef EATHENA_SUPPORT for_each_horses(mDownHorseSprites) (*it)->update(time); for_each_horses(mUpHorseSprites) (*it)->update(time); -#endif if (mCastEndTime != 0 && mCastEndTime < tick_time) { @@ -2445,7 +2407,6 @@ void Being::updateColors() setDefaultNameColor(UserColorId::NPC); mTextColor = &userPalette->getColor(UserColorId::NPC); } -#ifdef EATHENA_SUPPORT else if (mType == ActorType::Pet) { setDefaultNameColor(UserColorId::PET); @@ -2461,7 +2422,6 @@ void Being::updateColors() setDefaultNameColor(UserColorId::SKILLUNIT); mTextColor = &userPalette->getColor(UserColorId::SKILLUNIT); } -#endif #ifdef TMWA_SUPPORT else if (mType == ActorType::LocalPet) { @@ -3514,7 +3474,6 @@ void Being::drawPlayer(Graphics *restrict const graphics, const int px = mPixelX - mapTileSize / 2 + offsetX; // getActorY() + offsetY; const int py = mPixelY - mapTileSize + offsetY; -#ifdef EATHENA_SUPPORT if (mHorseInfo) { for_each_horses(mDownHorseSprites) @@ -3539,10 +3498,6 @@ void Being::drawPlayer(Graphics *restrict const graphics, drawBeingCursor(graphics, px, py); drawPlayerSpriteAt(graphics, px, py); } -#else - drawBeingCursor(graphics, px, py); - drawPlayerSpriteAt(graphics, px, py); -#endif } } @@ -3592,7 +3547,6 @@ void Being::drawMonster(Graphics *restrict const graphics, drawMonsterSpriteAt(graphics, px, py); } -#ifdef EATHENA_SUPPORT void Being::drawHomunculus(Graphics *restrict const graphics, const int offsetX, const int offsetY) const restrict2 @@ -3616,7 +3570,6 @@ void Being::drawMercenary(Graphics *restrict const graphics, drawBeingCursor(graphics, px, py); drawMercenarySpriteAt(graphics, px, py); } -#endif // EATHENA_SUPPORT void Being::drawPortal(Graphics *restrict const graphics, const int offsetX, @@ -3645,7 +3598,6 @@ void Being::draw(Graphics *restrict const graphics, offsetX, offsetY); break; -#ifdef EATHENA_SUPPORT case ActorType::Homunculus: drawHomunculus(graphics, offsetX, @@ -3659,7 +3611,6 @@ void Being::draw(Graphics *restrict const graphics, case ActorType::Pet: case ActorType::SkillUnit: case ActorType::Unknown: -#endif case ActorType::Monster: drawMonster(graphics, offsetX, @@ -3836,7 +3787,6 @@ void Being::drawMonsterSpriteAt(Graphics *restrict const graphics, } } -#ifdef EATHENA_SUPPORT void Being::drawHomunculusSpriteAt(Graphics *restrict const graphics, const int x, const int y) const restrict2 @@ -3946,7 +3896,6 @@ void Being::drawMercenarySpriteAt(Graphics *restrict const graphics, } } } -#endif void Being::drawPortalSpriteAt(Graphics *restrict const graphics, const int x, @@ -4465,12 +4414,10 @@ std::string Being::loadComment(const std::string &restrict name, case ActorType::Portal: case ActorType::LocalPet: case ActorType::Avatar: -#ifdef EATHENA_SUPPORT case ActorType::Mercenary: case ActorType::Homunculus: case ActorType::Pet: case ActorType::SkillUnit: -#endif default: return ""; } @@ -4505,12 +4452,10 @@ void Being::saveComment(const std::string &restrict name, case ActorType::LocalPet: case ActorType::Avatar: case ActorType::Unknown: -#ifdef EATHENA_SUPPORT case ActorType::Pet: case ActorType::Mercenary: case ActorType::Homunculus: case ActorType::SkillUnit: -#endif default: return; } @@ -5150,7 +5095,6 @@ void Being::updateBadgesCount() restrict2 } } -#ifdef EATHENA_SUPPORT void Being::setChat(ChatObject *restrict const obj) restrict2 { delete mChat; @@ -5172,7 +5116,6 @@ void Being::setBuyBoard(const std::string &restrict text) restrict2 updateName(); showShopBadge(mShop); } -#endif void Being::enableShop(const bool b) restrict2 { @@ -5183,20 +5126,12 @@ void Being::enableShop(const bool b) restrict2 bool Being::isBuyShopEnabled() const restrict2 { -#ifdef EATHENA_SUPPORT return mShop && (!serverFeatures->haveVending() || !mBuyBoard.empty()); -#else - return mShop; -#endif } bool Being::isSellShopEnabled() const restrict2 { -#ifdef EATHENA_SUPPORT return mShop && (!serverFeatures->haveVending() || !mSellBoard.empty()); -#else - return mShop; -#endif } void Being::serverRemove() restrict2 noexcept2 @@ -5240,7 +5175,6 @@ void Being::addCast(const int dstX, } } -#ifdef EATHENA_SUPPORT void Being::removeHorse() restrict2 { delete_all(mUpHorseSprites); @@ -5363,4 +5297,3 @@ void Being::stopCast(const bool b) if (b && mAction == BeingAction::CAST) setAction(BeingAction::STAND, 0); } -#endif diff --git a/src/being/being.h b/src/being/being.h index 9a9cfb1a8..a224403c7 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -956,7 +956,6 @@ class Being notfinal : public ActorSprite, virtual int getLastAttackY() const restrict2 { return mLastAttackY; } -#ifdef EATHENA_SUPPORT void drawHomunculus(Graphics *restrict const graphics, const int offsetX, const int offsetY) const @@ -1002,7 +1001,6 @@ class Being notfinal : public ActorSprite, BeingId getCreatorId() const noexcept2 A_WARN_UNUSED { return mCreatorId; } -#endif void setKarma(const int karma) restrict2 noexcept2 { mKarma = karma; } @@ -1077,7 +1075,6 @@ class Being notfinal : public ActorSprite, const int x, const int y) const restrict2 A_NONNULL(2); -#ifdef EATHENA_SUPPORT void drawHomunculusSpriteAt(Graphics *restrict const graphics, const int x, const int y) const restrict2 A_NONNULL(2); @@ -1085,7 +1082,6 @@ class Being notfinal : public ActorSprite, void drawMercenarySpriteAt(Graphics *restrict const graphics, const int x, const int y) const restrict2 A_NONNULL(2); -#endif // EATHENA_SUPPORT void drawCompound(Graphics *const graphics, const int posX, @@ -1224,20 +1220,16 @@ class Being notfinal : public ActorSprite, int *restrict mSpriteHide A_NONNULLPOINTER; int *restrict mSpriteDraw A_NONNULLPOINTER; std::string mComment; -#ifdef EATHENA_SUPPORT std::string mBuyBoard; std::string mSellBoard; -#endif std::vector<Being*> mPets; Being *restrict mOwner; Particle *restrict mSpecialParticle; -#ifdef EATHENA_SUPPORT ChatObject *restrict mChat; HorseInfo *restrict mHorseInfo; std::vector<AnimatedSprite*> mDownHorseSprites; std::vector<AnimatedSprite*> mUpHorseSprites; std::vector<Particle*> mSpiritParticles; -#endif int mX; // position in tiles int mY; // position in tiles @@ -1293,9 +1285,7 @@ class Being notfinal : public ActorSprite, int mManner; int mAreaSize; int mCastEndTime; -#ifdef EATHENA_SUPPORT BeingId mCreatorId; -#endif uint16_t mTeamId; uint16_t mLook; uint16_t mBadgesCount; diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index abecee8de..62f30a015 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -480,9 +480,7 @@ void LocalPlayer::nextTile(unsigned char dir A_UNUSED = 0) Being::nextTile(); } -#ifdef EATHENA_SUPPORT PlayerInfo::updateMoveAI(); -#endif } bool LocalPlayer::pickUp(FloorItem *const item) @@ -821,9 +819,7 @@ void LocalPlayer::attack(Being *const target, const bool keep, const BeingId targetId = target->getId(); playerHandler->attack(targetId, mServerAttack); -#ifdef EATHENA_SUPPORT PlayerInfo::updateAttackAi(targetId, mServerAttack); -#endif } if (!keep) @@ -1644,10 +1640,8 @@ void LocalPlayer::specialMove(const unsigned char direction) void LocalPlayer::magicAttack() const { -#ifdef EATHENA_SUPPORT if (Net::getNetworkType() != ServerType::TMWATHENA) return; -#endif if (!chatWindow || !isAlive() || !playerHandler->canUseMagic()) { diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp index 89fd30245..ff69a0d34 100644 --- a/src/being/playerinfo.cpp +++ b/src/being/playerinfo.cpp @@ -26,11 +26,9 @@ #include "being/localplayer.h" -#ifdef EATHENA_SUPPORT #include "being/homunculusinfo.h" #include "being/mercenaryinfo.h" #include "being/petinfo.h" -#endif #include "gui/windows/inventorywindow.h" #include "gui/windows/npcdialog.h" @@ -53,13 +51,11 @@ PlayerInfoBackend mData; int mCharId = 0; Inventory *mInventory = nullptr; -#ifdef EATHENA_SUPPORT Inventory *mCartInventory = nullptr; MercenaryInfo *mMercenary = nullptr; HomunculusInfo *mHomunculus = nullptr; PetInfo *mPet = nullptr; std::string mRoomName; -#endif Equipment *mEquipment = nullptr; BeingId mPetBeingId = BeingId_zero; GuildPositionFlags::Type mGuildPositionFlags = GuildPositionFlags::None; @@ -211,12 +207,10 @@ Inventory *getStorageInventory() return nullptr; } -#ifdef EATHENA_SUPPORT Inventory *getCartInventory() { return mCartInventory; } -#endif void clearInventory() { @@ -273,7 +267,6 @@ void useEquipItem(const Item *const item, const Sfx sfx) { if (item) { -#ifdef EATHENA_SUPPORT if (item->getType() == ItemType::Card) { if (mProtectedItems.find(item->getId()) == mProtectedItems.end()) @@ -284,9 +277,7 @@ void useEquipItem(const Item *const item, const Sfx sfx) ItemSoundManager::playSfx(item, ItemSoundEvent::USECARD); } } - else -#endif - if (item->isEquipment() == Equipm_true) + else if (item->isEquipment() == Equipm_true) { if (item->isEquipped() == Equipped_true) { @@ -436,9 +427,7 @@ void init() void deinit() { clearInventory(); -#ifdef EATHENA_SUPPORT delete2(mMercenary); -#endif mPetBeingId = BeingId_zero; } @@ -464,9 +453,7 @@ void gameDestroyed() { delete2(mInventory); delete2(mEquipment); -#ifdef EATHENA_SUPPORT delete2(mCartInventory); -#endif } void stateChange(const StateT state) @@ -477,9 +464,7 @@ void stateChange(const StateT state) { mInventory = new Inventory(InventoryType::Inventory); mEquipment = new Equipment(); -#ifdef EATHENA_SUPPORT mCartInventory = new Inventory(InventoryType::Cart); -#endif } } } @@ -520,7 +505,6 @@ bool isItemProtected(const int id) return mProtectedItems.find(id) != mProtectedItems.end(); } -#ifdef EATHENA_SUPPORT void setMercenary(MercenaryInfo *const info) { delete mMercenary; @@ -631,7 +615,6 @@ bool isInRoom() { return !mRoomName.empty(); } -#endif void setGuildPositionFlags(const GuildPositionFlags::Type pos) { diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h index 269cd8221..d7c1be8fa 100644 --- a/src/being/playerinfo.h +++ b/src/being/playerinfo.h @@ -37,9 +37,7 @@ #include "utils/intmap.h" -#ifdef EATHENA_SUPPORT #include <string> -#endif /** * Stat information storage structure. @@ -164,9 +162,7 @@ namespace PlayerInfo Inventory *getStorageInventory() A_WARN_UNUSED; -#ifdef EATHENA_SUPPORT Inventory *getCartInventory() A_WARN_UNUSED; -#endif /** * Clears the player's inventory and equipment. @@ -253,7 +249,6 @@ namespace PlayerInfo bool isItemProtected(const int id); -#ifdef EATHENA_SUPPORT MercenaryInfo *getMercenary(); void setMercenary(MercenaryInfo *const info); @@ -288,7 +283,6 @@ namespace PlayerInfo void setRoomName(const std::string &name); bool isInRoom(); -#endif void setGuildPositionFlags(const GuildPositionFlags::Type pos); diff --git a/src/client.cpp b/src/client.cpp index f0deaeca4..1fec49b29 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -602,7 +602,6 @@ void Client::gameClear() EmoteDB::unload(); ItemDB::unload(); ItemFieldDb::unload(); -#ifdef EATHENA_SUPPORT const ServerTypeT type = Net::getNetworkType(); if (type == ServerType::EATHENA || type == ServerType::EVOL2) @@ -612,7 +611,6 @@ void Client::gameClear() SkillUnitDb::unload(); HorseDB::unload(); } -#endif MonsterDB::unload(); NPCDB::unload(); NpcDialogDB::unload(); @@ -1331,7 +1329,6 @@ int Client::gameExec() ItemFieldDb::load(); ItemDB::load(); Being::load(); -#ifdef EATHENA_SUPPORT const ServerTypeT type = Net::getNetworkType(); if (type == ServerType::EATHENA || type == ServerType::EVOL2) @@ -1341,7 +1338,6 @@ int Client::gameExec() SkillUnitDb::load(); HorseDB::load(); } -#endif MonsterDB::load(); AvatarDB::load(); BadgesDB::load(); diff --git a/src/dragdrop.h b/src/dragdrop.h index e1f6ae9e8..65e87c5e1 100644 --- a/src/dragdrop.h +++ b/src/dragdrop.h @@ -230,10 +230,8 @@ class DragDrop final { return mSource == DragDropSource::Inventory || mSource == DragDropSource::Storage -#ifdef EATHENA_SUPPORT || mSource == DragDropSource::Cart || mSource == DragDropSource::Craft -#endif || mSource == DragDropSource::Trade || mSource == DragDropSource::Outfit || mSource == DragDropSource::Ground diff --git a/src/enums/being/actortype.h b/src/enums/being/actortype.h index 8e8eb7851..c742255d9 100644 --- a/src/enums/being/actortype.h +++ b/src/enums/being/actortype.h @@ -33,15 +33,11 @@ enumStart(ActorType) FloorItem, Portal, LocalPet, -#ifdef EATHENA_SUPPORT Avatar, Pet, Mercenary, Homunculus, SkillUnit -#else - Avatar -#endif } enumEnd(ActorType); diff --git a/src/enums/being/cookingtype.h b/src/enums/being/cookingtype.h index 4b27c965a..55aba4776 100644 --- a/src/enums/being/cookingtype.h +++ b/src/enums/being/cookingtype.h @@ -20,7 +20,6 @@ #ifndef ENUMS_BEING_COOKINGTYPE_H #define ENUMS_BEING_COOKINGTYPE_H -#ifdef EATHENA_SUPPORT #include "enums/simpletypes/enumdefines.h" @@ -35,5 +34,4 @@ enumStart(CookingType) } enumEnd(CookingType); -#endif // EATHENA_SUPPORT #endif // ENUMS_BEING_COOKINGTYPE_H diff --git a/src/enums/being/rank.h b/src/enums/being/rank.h index ffb469ed7..6268207bd 100644 --- a/src/enums/being/rank.h +++ b/src/enums/being/rank.h @@ -20,7 +20,6 @@ #ifndef ENUMS_BEING_RANK_H #define ENUMS_BEING_RANK_H -#ifdef EATHENA_SUPPORT #include "enums/simpletypes/enumdefines.h" @@ -33,5 +32,4 @@ enumStart(Rank) } enumEnd(Rank); -#endif // EATHENA_SUPPORT #endif // ENUMS_BEING_RANK_H diff --git a/src/enums/cutin.h b/src/enums/cutin.h index 095832fe9..a24fbe384 100644 --- a/src/enums/cutin.h +++ b/src/enums/cutin.h @@ -21,8 +21,6 @@ #ifndef ENUMS_CUTIN_H #define ENUMS_CUTIN_H -#ifdef EATHENA_SUPPORT - #include "enums/simpletypes/enumdefines.h" enumStart(CutIn) @@ -35,5 +33,4 @@ enumStart(CutIn) } enumEnd(CutIn); -#endif // EATHENA_SUPPORT #endif // ENUMS_CUTIN_H diff --git a/src/enums/dragdropsource.h b/src/enums/dragdropsource.h index 9a65b9dcb..e96de703b 100644 --- a/src/enums/dragdropsource.h +++ b/src/enums/dragdropsource.h @@ -36,14 +36,10 @@ enumStart(DragDropSource) Drop, Shortcuts, Npc, -#ifdef EATHENA_SUPPORT Equipment, Cart, Mail, Craft -#else - Equipment -#endif } enumEnd(DragDropSource); diff --git a/src/enums/emotetype.h b/src/enums/emotetype.h index a6cde24af..d0a1de652 100644 --- a/src/enums/emotetype.h +++ b/src/enums/emotetype.h @@ -26,10 +26,8 @@ enumStart(EmoteType) { Player = 0, -#ifdef EATHENA_SUPPORT Homunculus, Mercenary, -#endif Pet } enumEnd(EmoteType); diff --git a/src/enums/gui/itemamountwindowusage.h b/src/enums/gui/itemamountwindowusage.h index 982341a2a..7926c3f77 100644 --- a/src/enums/gui/itemamountwindowusage.h +++ b/src/enums/gui/itemamountwindowusage.h @@ -35,13 +35,9 @@ enumStart(ItemAmountWindowUsage) CartRemove, ItemSplit, ShopBuyAdd, -#ifdef EATHENA_SUPPORT ShopSellAdd, CraftAdd, MailAdd -#else - ShopSellAdd -#endif } enumEnd(ItemAmountWindowUsage); diff --git a/src/enums/inventorytype.h b/src/enums/inventorytype.h index b15676c2a..47c4aa4e0 100644 --- a/src/enums/inventorytype.h +++ b/src/enums/inventorytype.h @@ -31,12 +31,10 @@ enumStart(InventoryType) Storage, Trade, Npc, -#ifdef EATHENA_SUPPORT Cart, Vending, Mail, Craft, -#endif TypeEnd } enumEnd(InventoryType); diff --git a/src/enums/net/auctionsearchtype.h b/src/enums/net/auctionsearchtype.h index 45747edc8..da335fc17 100644 --- a/src/enums/net/auctionsearchtype.h +++ b/src/enums/net/auctionsearchtype.h @@ -20,7 +20,6 @@ #ifndef ENUMS_NET_AUCTIONSEARCHTYPE_H #define ENUMS_NET_AUCTIONSEARCHTYPE_H -#ifdef EATHENA_SUPPORT #include "enums/simpletypes/enumdefines.h" @@ -35,5 +34,4 @@ enumStart(AuctionSearchType) } enumEnd(AuctionSearchType); -#endif // EATHENA_SUPPORT #endif // ENUMS_NET_AUCTIONSEARCHTYPE_H diff --git a/src/enums/net/battlegroundtype.h b/src/enums/net/battlegroundtype.h index fc535417f..2b4aaa507 100644 --- a/src/enums/net/battlegroundtype.h +++ b/src/enums/net/battlegroundtype.h @@ -20,7 +20,6 @@ #ifndef ENUMS_NET_BATTLEGROUNDTYPE_H #define ENUMS_NET_BATTLEGROUNDTYPE_H -#ifdef EATHENA_SUPPORT #include "enums/simpletypes/enumdefines.h" @@ -33,5 +32,4 @@ enumStart(BattleGroundType) } enumEnd(BattleGroundType); -#endif // EATHENA_SUPPORT #endif // ENUMS_NET_BATTLEGROUNDTYPE_H diff --git a/src/enums/net/deleteitemreason.h b/src/enums/net/deleteitemreason.h index 69a1ba597..03d3c45f6 100644 --- a/src/enums/net/deleteitemreason.h +++ b/src/enums/net/deleteitemreason.h @@ -20,7 +20,6 @@ #ifndef ENUMS_NET_DELETEITEMREASON_H #define ENUMS_NET_DELETEITEMREASON_H -#ifdef EATHENA_SUPPORT #include "enums/simpletypes/enumdefines.h" @@ -37,5 +36,4 @@ enumStart(DeleteItemReason) } enumEnd(DeleteItemReason); -#endif // EATHENA_SUPPORT #endif // ENUMS_NET_DELETEITEMREASON_H diff --git a/src/enums/net/storesearchtype.h b/src/enums/net/storesearchtype.h index a003ccefc..b0551a7e6 100644 --- a/src/enums/net/storesearchtype.h +++ b/src/enums/net/storesearchtype.h @@ -20,7 +20,6 @@ #ifndef ENUMS_NET_STORESEARCHTYPE_H #define ENUMS_NET_STORESEARCHTYPE_H -#ifdef EATHENA_SUPPORT #include "enums/simpletypes/enumdefines.h" @@ -31,5 +30,4 @@ enumStart(StoreSearchType) } enumEnd(StoreSearchType); -#endif // EATHENA_SUPPORT #endif // ENUMS_NET_STORESEARCHTYPE_H diff --git a/src/game.cpp b/src/game.cpp index 0f59c2308..1b3cbc8e4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -64,11 +64,9 @@ #include "gui/popups/popupmenu.h" -#ifdef EATHENA_SUPPORT #include "gui/windows/bankwindow.h" #include "gui/windows/cutinwindow.h" #include "gui/windows/mailwindow.h" -#endif #include "gui/windows/chatwindow.h" #include "gui/windows/debugwindow.h" #include "gui/windows/didyouknowwindow.h" @@ -209,14 +207,12 @@ static void createGuiWindows() CREATEWIDGETV0(miniStatusWindow, MiniStatusWindow); CREATEWIDGETV(inventoryWindow, InventoryWindow, PlayerInfo::getInventory()); -#ifdef EATHENA_SUPPORT if (serverFeatures && serverFeatures->haveCart()) { CREATEWIDGETV(cartWindow, InventoryWindow, PlayerInfo::getCartInventory()); } CREATEWIDGETV0(cutInWindow, CutInWindow); -#endif CREATEWIDGETV0(shopWindow, ShopWindow); CREATEWIDGETV0(skillDialog, SkillDialog); CREATEWIDGETV0(minimap, Minimap); @@ -255,10 +251,8 @@ static void createGuiWindows() new SpellShortcutContainer(nullptr, f)); } -#ifdef EATHENA_SUPPORT CREATEWIDGETV0(bankWindow, BankWindow); CREATEWIDGETV0(mailWindow, MailWindow); -#endif CREATEWIDGETV0(whoIsOnline, WhoIsOnline); CREATEWIDGETV0(killStats, KillStats); CREATEWIDGETV0(socialWindow, SocialWindow); @@ -346,9 +340,7 @@ static void destroyGuiWindows() delete2(statusWindow) delete2(miniStatusWindow) delete2(inventoryWindow) -#ifdef EATHENA_SUPPORT delete2(cartWindow) -#endif delete2(shopWindow) delete2(skillDialog) delete2(minimap) @@ -362,11 +354,9 @@ static void destroyGuiWindows() delete2(socialWindow) delete2(dropShortcutWindow); delete2(spellShortcutWindow); -#ifdef EATHENA_SUPPORT delete2(bankWindow); delete2(cutInWindow); delete2(mailWindow); -#endif delete2(questsWindow); delete2(whoIsOnline); delete2(killStats); @@ -428,9 +418,7 @@ Game::Game() : initEngines(); chatWindow->postConnection(); -#ifdef EATHENA_SUPPORT mailWindow->postConnection(); -#endif // Initialize beings if (actorManager) diff --git a/src/gui/models/typelistmodel.h b/src/gui/models/typelistmodel.h index 04d9d93de..6d96568c7 100644 --- a/src/gui/models/typelistmodel.h +++ b/src/gui/models/typelistmodel.h @@ -37,10 +37,8 @@ class TypeListModel final : public ListModel * Used to get number of line in the list */ int getNumberOfElements() override final A_WARN_UNUSED -#if defined(EATHENA_SUPPORT) && defined(TMWA_SUPPORT) +#if defined(TMWA_SUPPORT) { return 3; } -#elif defined(EATHENA_SUPPORT) - { return 2; } #else { return 2; } #endif @@ -54,21 +52,17 @@ class TypeListModel final : public ListModel #ifdef TMWA_SUPPORT if (elementIndex == 0) return "TmwAthena"; -#ifdef EATHENA_SUPPORT else if (elementIndex == 1) return "Hercules"; else if (elementIndex == 2) return "Evol2"; -#endif // EATHENA_SUPPORT else #else // TMWA_SUPPORT -#ifdef EATHENA_SUPPORT if (elementIndex == 0) return "Hercules"; else if (elementIndex == 1) return "Evol2"; else -#endif // EATHENA_SUPPORT #endif // TMWA_SUPPORT return "Unknown"; } diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index 3809ed4d2..75b72c732 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -126,7 +126,6 @@ void BeingPopup::show(const int x, const int y, Being *const b) (*it)->setCaption(std::string()); } -#ifdef EATHENA_SUPPORT const ActorTypeT type = b->getType(); if (type == ActorType::Pet) { @@ -167,7 +166,6 @@ void BeingPopup::show(const int x, const int y, Being *const b) } } else -#endif { if (!(b->getPartyName().empty())) { @@ -199,7 +197,6 @@ void BeingPopup::show(const int x, const int y, Being *const b) num ++; } -#ifdef EATHENA_SUPPORT if (!b->getBuyBoard().empty()) { ptr = mLabels[num]; @@ -209,9 +206,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) ptr->adjustSize(); num ++; } -#endif -#ifdef EATHENA_SUPPORT if (!b->getSellBoard().empty()) { ptr = mLabels[num]; @@ -221,7 +216,6 @@ void BeingPopup::show(const int x, const int y, Being *const b) ptr->adjustSize(); num ++; } -#endif if (!b->getComment().empty()) { @@ -244,7 +238,6 @@ void BeingPopup::show(const int x, const int y, Being *const b) num ++; } -#ifdef EATHENA_SUPPORT const ChatObject *const chat = b->getChat(); if (chat) { @@ -255,7 +248,6 @@ void BeingPopup::show(const int x, const int y, Being *const b) ptr->adjustSize(); num ++; } -#endif } ptr = mLabels[num]; // TRANSLATORS: being popup label diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index f96a73493..158f8c57c 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -223,9 +223,7 @@ void ItemPopup::setItem(const ItemInfo &item, // TRANSLATORS: popup label mItemWeight->setTextWrapped(strprintf(_("Weight: %s"), Units::formatWeight(item.getWeight()).c_str()), 196); -#ifdef EATHENA_SUPPORT mItemCards->setTextWrapped(getCardsString(cards), 196); -#endif int minWidth = mItemName->getWidth() + space; @@ -267,7 +265,6 @@ void ItemPopup::setItem(const ItemInfo &item, mItemDesc->setPosition(0, 2 * height); } -#ifdef EATHENA_SUPPORT std::string ItemPopup::getCardsString(const int *const cards) { if (!cards) @@ -319,7 +316,6 @@ std::string ItemPopup::getCardsString(const int *const cards) } } } -#endif #define caseSetColor(name1, name2) \ case name1: \ diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index f862d2754..b9439fe1d 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -73,9 +73,7 @@ class ItemPopup final : public Popup void resetPopup(); private: -#ifdef EATHENA_SUPPORT std::string getCardsString(const int *const cards); -#endif Label *mItemName A_NONNULLPOINTER; TextBox *mItemDesc A_NONNULLPOINTER; diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 4c417036b..e74873a10 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -67,11 +67,9 @@ #include "net/adminhandler.h" #include "net/chathandler.h" #include "net/guildhandler.h" -#ifdef EATHENA_SUPPORT #include "net/homunculushandler.h" #include "net/mercenaryhandler.h" #include "net/npchandler.h" -#endif #include "net/net.h" #include "net/pethandler.h" #include "net/serverfeatures.h" @@ -163,9 +161,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) mY = y; const std::string &name = mName; -#ifdef EATHENA_SUPPORT if (being->getType() != ActorType::SkillUnit) -#endif { mBrowserBox->addRow(name + being->getGenderSignWithSpace()); } @@ -258,9 +254,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) mBrowserBox->addRow("/navigateto 'NAME'", _("Move")); addPlayerMisc(); addBuySell(being); -#ifdef EATHENA_SUPPORT addChat(being); -#endif break; } @@ -293,9 +287,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) // TRANSLATORS: popup menu item // TRANSLATORS: add comment to npc mBrowserBox->addRow("addcomment", _("Add comment")); -#ifdef EATHENA_SUPPORT addChat(being); -#endif break; case ActorType::Monster: @@ -339,7 +331,6 @@ 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 @@ -435,7 +426,6 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) creatorName.c_str())); break; } -#endif case ActorType::Avatar: case ActorType::Unknown: case ActorType::FloorItem: @@ -1122,7 +1112,6 @@ void PopupMenu::showEmoteType() // TRANSLATORS: show emotes for pet mBrowserBox->addRow("/setemotetype pet", _("Pet")); -#ifdef EATHENA_SUPPORT if (serverFeatures->haveServerPets()) { // TRANSLATORS: popup menu item @@ -1133,7 +1122,6 @@ void PopupMenu::showEmoteType() // TRANSLATORS: show emotes for mercenary mBrowserBox->addRow("/setemotetype merc", _("Mercenary")); } -#endif mBrowserBox->addRow("##3---"); // TRANSLATORS: popup menu item @@ -1479,7 +1467,6 @@ void PopupMenu::handleLink(const std::string &link, if (Widget::widgetExists(mWindow)) mWindow->setSticky(true); } -#ifdef EATHENA_SUPPORT else if (link == "join chat" && being) { const ChatObject *const chat = being->getChat(); @@ -1511,7 +1498,6 @@ void PopupMenu::handleLink(const std::string &link, showCraftPopup(); return; } -#endif else if (link == "pet feed") { petHandler->feed(); @@ -1799,7 +1785,6 @@ void PopupMenu::showPopup(Window *const parent, } mBrowserBox->addRow("##3---"); } -#ifdef EATHENA_SUPPORT if (npcHandler) { NpcDialog *const dialog = npcHandler->getCurrentNpcDialog(); @@ -1812,7 +1797,6 @@ void PopupMenu::showPopup(Window *const parent, _("Move to craft...")); } } -#endif addUseDrop(item, isProtected); break; @@ -1846,12 +1830,10 @@ void PopupMenu::showPopup(Window *const parent, case InventoryType::Trade: case InventoryType::Npc: -#ifdef EATHENA_SUPPORT case InventoryType::Cart: case InventoryType::Vending: case InventoryType::Mail: case InventoryType::Craft: -#endif case InventoryType::TypeEnd: default: break; @@ -2687,7 +2669,6 @@ void PopupMenu::addParty(const std::string &nick) } } -#ifdef EATHENA_SUPPORT void PopupMenu::addChat(const Being *const being) { if (!being) @@ -2702,7 +2683,6 @@ void PopupMenu::addChat(const Being *const being) mBrowserBox->addRow("##3---"); } } -#endif void PopupMenu::addPlayerMisc() { @@ -3197,7 +3177,6 @@ void PopupMenu::showGMPopup(const std::string &name) case ActorType::FloorItem: showFloorItemGMCommands(); break; -#ifdef EATHENA_SUPPORT case ActorType::Homunculus: showHomunGMCommands(); break; @@ -3209,7 +3188,6 @@ void PopupMenu::showGMPopup(const std::string &name) break; case ActorType::SkillUnit: break; -#endif default: case ActorType::Unknown: if (mItemId != 0) @@ -3230,7 +3208,6 @@ void PopupMenu::showGMPopup(const std::string &name) showPopup(getX(), getY()); } -#ifdef EATHENA_SUPPORT void PopupMenu::showHomunGMCommands() { } @@ -3262,40 +3239,33 @@ void PopupMenu::showCraftPopup() showPopup(mX, mY); } -#endif void PopupMenu::addMailCommands() { -#ifdef EATHENA_SUPPORT if (!serverFeatures->haveMail()) return; // TRANSLATORS: popup menu item // TRANSLATORS: open mail dialog mBrowserBox->addRow("/mailto 'NAME'", _("Mail to...")); -#endif } void PopupMenu::addCatchPetCommands() { -#ifdef EATHENA_SUPPORT if (!serverFeatures->haveServerPets()) return; // TRANSLATORS: popup menu item // TRANSLATORS: catch pet command mBrowserBox->addRow("/catchpet :'BEINGID'", _("Taming pet")); -#endif } void PopupMenu::showAdoptCommands() { -#ifdef EATHENA_SUPPORT if (!serverFeatures->haveFamily()) return; // TRANSLATORS: popup menu item // TRANSLATORS: adopt child command mBrowserBox->addRow("/adoptchild 'NAME'", _("Adopt child")); -#endif } void PopupMenu::moveUp() diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index cc1ad285f..a7a745873 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -165,9 +165,7 @@ class PopupMenu final : public Popup, public LinkHandler void showSkillLevelPopup(const SkillInfo *const info); -#ifdef EATHENA_SUPPORT void showCraftPopup(); -#endif void showEmoteType(); @@ -223,7 +221,6 @@ class PopupMenu final : public Popup, public LinkHandler void addWindowMenu(const Window *const window); -#ifdef EATHENA_SUPPORT void showHomunGMCommands(); void showPetGMCommands(); @@ -231,7 +228,6 @@ class PopupMenu final : public Popup, public LinkHandler void showMercenaryGMCommands(); void addChat(const Being *const being); -#endif void addMailCommands(); diff --git a/src/gui/shortcut/emoteshortcut.cpp b/src/gui/shortcut/emoteshortcut.cpp index 05a7b64c1..981a5c4e7 100644 --- a/src/gui/shortcut/emoteshortcut.cpp +++ b/src/gui/shortcut/emoteshortcut.cpp @@ -26,10 +26,8 @@ #include "being/localplayer.h" -#ifdef EATHENA_SUPPORT #include "net/homunculushandler.h" #include "net/mercenaryhandler.h" -#endif #include "net/pethandler.h" #include "resources/db/emotedb.h" @@ -110,14 +108,12 @@ void EmoteShortcut::useEmote(const int index) const case EmoteType::Pet: petHandler->emote(emote, 0); break; -#ifdef EATHENA_SUPPORT case EmoteType::Homunculus: homunculusHandler->emote(emote); break; case EmoteType::Mercenary: mercenaryHandler->emote(emote); break; -#endif } } } diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 90a32165a..a543f53bd 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -446,12 +446,8 @@ bool Viewport::leftMouseAction() } else if (!stopAttack && (type == ActorType::Monster || - type == ActorType::Npc -#ifdef EATHENA_SUPPORT - || - type == ActorType::SkillUnit -#endif - )) + type == ActorType::Npc || + type == ActorType::SkillUnit)) { if ((localPlayer->withinAttackRange(mHoverBeing) || inputManager.isActionActive(InputAction::ATTACK))) @@ -837,11 +833,9 @@ void Viewport::mouseMoved(MouseEvent &event) if (mHoverBeing && (type == ActorType::Player || type == ActorType::Npc -#ifdef EATHENA_SUPPORT || type == ActorType::Homunculus || type == ActorType::Mercenary || type == ActorType::Pet -#endif || type == ActorType::LocalPet)) { popupManager->hideTextPopup(); @@ -899,12 +893,10 @@ 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: case ActorType::SkillUnit: -#endif gui->setCursorType(mHoverBeing->getHoverCursor()); break; diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index d49b16c18..0ff13d5ad 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -40,19 +40,13 @@ #include "gui/windows/inventorywindow.h" #include "gui/windows/shopwindow.h" #include "gui/windows/shortcutwindow.h" -#ifdef EATHENA_SUPPORT #include "gui/windows/itemamountwindow.h" #include "gui/windows/npcdialog.h" -#endif -#ifdef EATHENA_SUPPORT #include "input/inputmanager.h" -#endif #include "net/inventoryhandler.h" -#ifdef EATHENA_SUPPORT #include "net/npchandler.h" -#endif #include "net/tradehandler.h" #include "utils/delete2.h" @@ -602,7 +596,6 @@ void ItemContainer::mousePressed(MouseEvent &event) case InventoryType::Npc: src = DragDropSource::Npc; break; -#ifdef EATHENA_SUPPORT case InventoryType::Cart: src = DragDropSource::Cart; break; @@ -612,11 +605,8 @@ void ItemContainer::mousePressed(MouseEvent &event) case InventoryType::Craft: src = DragDropSource::Craft; break; -#endif default: -#ifdef EATHENA_SUPPORT case InventoryType::Vending: -#endif case InventoryType::TypeEnd: break; } @@ -712,7 +702,6 @@ void ItemContainer::mouseReleased(MouseEvent &event) case InventoryType::Npc: dst = DragDropSource::Npc; break; -#ifdef EATHENA_SUPPORT case InventoryType::Mail: dst = DragDropSource::Mail; break; @@ -722,11 +711,8 @@ void ItemContainer::mouseReleased(MouseEvent &event) case InventoryType::Craft: dst = DragDropSource::Craft; break; -#endif default: -#ifdef EATHENA_SUPPORT case InventoryType::Vending: -#endif case InventoryType::TypeEnd: break; } @@ -748,7 +734,6 @@ void ItemContainer::mouseReleased(MouseEvent &event) dstContainer = InventoryType::Inventory; inventory = PlayerInfo::getStorageInventory(); } -#ifdef EATHENA_SUPPORT if (src == DragDropSource::Inventory && dst == DragDropSource::Cart) { @@ -789,7 +774,6 @@ void ItemContainer::mouseReleased(MouseEvent &event) dstContainer = InventoryType::Cart; inventory = PlayerInfo::getStorageInventory(); } -#endif if (src == DragDropSource::Inventory && dst == DragDropSource::Trade) { @@ -797,12 +781,8 @@ void ItemContainer::mouseReleased(MouseEvent &event) inventory = PlayerInfo::getInventory(); } else if (src == DragDropSource::Inventory -#ifdef EATHENA_SUPPORT && (dst == DragDropSource::Npc || dst == DragDropSource::Mail)) -#else - && dst == DragDropSource::Npc) -#endif { inventory = PlayerInfo::getInventory(); if (inventory) @@ -865,7 +845,6 @@ void ItemContainer::mouseReleased(MouseEvent &event) return; } } -#ifdef EATHENA_SUPPORT else if (src == DragDropSource::Inventory && dst == DragDropSource::Craft) { @@ -946,7 +925,6 @@ void ItemContainer::mouseReleased(MouseEvent &event) } return; } -#endif if (inventory) { diff --git a/src/gui/windows/bankwindow.h b/src/gui/windows/bankwindow.h index b3cea2be8..dca31aa45 100644 --- a/src/gui/windows/bankwindow.h +++ b/src/gui/windows/bankwindow.h @@ -21,8 +21,6 @@ #ifndef GUI_WINDOWS_BANKWINDOW_H #define GUI_WINDOWS_BANKWINDOW_H -#ifdef EATHENA_SUPPORT - #include "gui/widgets/window.h" #include "listeners/actionlistener.h" @@ -63,5 +61,4 @@ class BankWindow final : public Window, extern BankWindow *bankWindow; -#endif // EATHENA_SUPPORT #endif // GUI_WINDOWS_BANKWINDOW_H diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index 9dd083d61..7c7d96a13 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -22,9 +22,7 @@ #include "gui/windows/buydialog.h" -#ifdef EATHENA_SUPPORT #include "actormanager.h" -#endif #include "configuration.h" #include "units.h" @@ -48,11 +46,9 @@ #include "net/adminhandler.h" #include "net/buysellhandler.h" -#ifdef EATHENA_SUPPORT #include "net/cashshophandler.h" #include "net/markethandler.h" #include "net/vendinghandler.h" -#endif #include "net/serverfeatures.h" #include "net/npchandler.h" @@ -443,14 +439,12 @@ void BuyDialog::close() case Nick: case Items: break; -#ifdef EATHENA_SUPPORT case Market: marketHandler->close(); break; case Cash: cashShopHandler->close(); break; -#endif default: buySellHandler->close(); break; @@ -537,7 +531,6 @@ void BuyDialog::action(const ActionEvent &event) if (mConfirmButton) mConfirmButton->setEnabled(true); } -#ifdef EATHENA_SUPPORT else if (mNpcId == fromInt(Market, BeingId)) { marketHandler->buyItem(item->getId(), @@ -554,7 +547,6 @@ void BuyDialog::action(const ActionEvent &event) item->getColor(), mAmountItems); } -#endif else { npcHandler->buyItem(mNpcId, @@ -567,7 +559,6 @@ void BuyDialog::action(const ActionEvent &event) } else if (mNpcId == fromInt(Nick, BeingId)) { -#ifdef EATHENA_SUPPORT if (serverFeatures->haveVending()) { const Being *const being = actorManager->findBeingByName( @@ -583,9 +574,6 @@ void BuyDialog::action(const ActionEvent &event) } } else if (tradeWindow) -#else - if (tradeWindow) -#endif { buySellHandler->sendBuyRequest(mNick, item, mAmountItems); @@ -598,13 +586,11 @@ void BuyDialog::action(const ActionEvent &event) { std::vector<ShopItem*> &items = mShopItems->allItems(); -#ifdef EATHENA_SUPPORT if (mNpcId == fromInt(Market, BeingId)) { marketHandler->buyItems(items); } else -#endif { npcHandler->buyItems(items); } diff --git a/src/gui/windows/buyingstoreselldialog.h b/src/gui/windows/buyingstoreselldialog.h index cb2219fca..db197bd22 100644 --- a/src/gui/windows/buyingstoreselldialog.h +++ b/src/gui/windows/buyingstoreselldialog.h @@ -23,8 +23,6 @@ #ifndef GUI_WINDOWS_BUYINGSTORESELLDIALOG_H #define GUI_WINDOWS_BUYINGSTORESELLDIALOG_H -#ifdef EATHENA_SUPPORT - #include "enums/simpletypes/beingid.h" #include "gui/widgets/selldialog.h" @@ -56,5 +54,4 @@ class BuyingStoreSellDialog final : public SellDialog int mStoreId; }; -#endif // EATHENA_SUPPORT #endif // GUI_WINDOWS_BUYINGSTORESELLDIALOG_H diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 4f62ac9ba..56b0c5930 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -27,9 +27,7 @@ #include "units.h" #include "listeners/charrenamelistener.h" -#ifdef EATHENA_SUPPORT #include "listeners/pincodelistener.h" -#endif #include "gui/windows/charcreatedialog.h" #include "gui/windows/chardeleteconfirm.h" @@ -165,7 +163,6 @@ void CharSelectDialog::postInit() Window::postInit(); setVisible(Visible_true); requestFocus(); -#ifdef EATHENA_SUPPORT if (charServerHandler->isNeedCreatePin()) { EditDialog *const dialog = CREATEWIDGETR(EditDialog, @@ -175,7 +172,6 @@ void CharSelectDialog::postInit() "OK"); dialog->addActionListener(&pincodeListener); } -#endif } void CharSelectDialog::action(const ActionEvent &event) diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index c9107b151..6685852fb 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -2205,7 +2205,6 @@ void ChatWindow::toggleChatFocus() requestChatFocus(); } -#ifdef EATHENA_SUPPORT void ChatWindow::joinRoom(const bool isJoin) { Tab *const tab = mChatTabs->getTabByIndex(0); @@ -2224,4 +2223,3 @@ void ChatWindow::joinRoom(const bool isJoin) tab->setCaption(name); } } -#endif diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index e8b0dc940..5032d337a 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -209,9 +209,7 @@ class ChatWindow final : public Window, const bool switchTo, const bool join) A_WARN_UNUSED; -#ifdef EATHENA_SUPPORT void joinRoom(const bool isJoin); -#endif void removeAllWhispers(); diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index 154dca6b4..8f65bb8f5 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -149,15 +149,11 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent, switch (mServer.type) { case ServerType::EATHENA: -#ifdef EATHENA_SUPPORT #ifdef TMWA_SUPPORT mTypeField->setSelected(1); #else // TMWA_SUPPORT mTypeField->setSelected(0); #endif // TMWA_SUPPORT -#else // EATHENA_SUPPORT - mTypeField->setSelected(0); -#endif // EATHENA_SUPPORT break; default: case ServerType::UNKNOWN: @@ -165,15 +161,11 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent, mTypeField->setSelected(0); break; case ServerType::EVOL2: -#ifdef EATHENA_SUPPORT #ifdef TMWA_SUPPORT mTypeField->setSelected(2); #else // TMWA_SUPPORT mTypeField->setSelected(1); #endif // TMWA_SUPPORT -#else // EATHENA_SUPPORT - mTypeField->setSelected(0); -#endif // EATHENA_SUPPORT break; } @@ -236,7 +228,6 @@ void EditServerDialog::action(const ActionEvent &event) mPortField->getText().c_str())); mServer.persistentIp = mPersistentIp->isSelected(); -#if defined(TMWA_SUPPORT) || defined(EATHENA_SUPPORT) if (mTypeField) { switch (mTypeField->getSelected()) @@ -245,16 +236,13 @@ void EditServerDialog::action(const ActionEvent &event) case 0: mServer.type = ServerType::TMWATHENA; break; -#ifdef EATHENA_SUPPORT case 1: mServer.type = ServerType::EATHENA; break; case 2: mServer.type = ServerType::EVOL2; break; -#endif #else -#ifdef EATHENA_SUPPORT case 0: mServer.type = ServerType::EATHENA; break; @@ -262,14 +250,12 @@ void EditServerDialog::action(const ActionEvent &event) mServer.type = ServerType::EVOL2; break; #endif -#endif default: mServer.type = ServerType::UNKNOWN; break; } } else -#endif // defined(TMWA_SUPPORT) || defined(EATHENA_SUPPORT) { mServer.type = ServerType::TMWATHENA; } diff --git a/src/gui/windows/eggselectiondialog.h b/src/gui/windows/eggselectiondialog.h index c8060dc10..2db06ba40 100644 --- a/src/gui/windows/eggselectiondialog.h +++ b/src/gui/windows/eggselectiondialog.h @@ -23,8 +23,6 @@ #ifndef GUI_WINDOWS_EGGSELECTIONDIALOG_H #define GUI_WINDOWS_EGGSELECTIONDIALOG_H -#ifdef EATHENA_SUPPORT - #include "gui/widgets/selldialog.h" class EggSelectionDialog final : public SellDialog @@ -44,5 +42,4 @@ class EggSelectionDialog final : public SellDialog void sellAction(const ActionEvent &event) override final; }; -#endif // EATHENA_SUPPORT #endif // GUI_WINDOWS_EGGSELECTIONDIALOG_H diff --git a/src/gui/windows/insertcarddialog.h b/src/gui/windows/insertcarddialog.h index eff74cde0..a8d54e86f 100644 --- a/src/gui/windows/insertcarddialog.h +++ b/src/gui/windows/insertcarddialog.h @@ -23,8 +23,6 @@ #ifndef GUI_WINDOWS_INSERTCARDDIALOG_H #define GUI_WINDOWS_INSERTCARDDIALOG_H -#ifdef EATHENA_SUPPORT - #include "gui/widgets/selldialog.h" class InsertCardDialog final : public SellDialog @@ -48,5 +46,4 @@ class InsertCardDialog final : public SellDialog int mItemIndex; }; -#endif // EATHENA_SUPPORT #endif // GUI_WINDOWS_INSERTCARDDIALOG_H diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index be38f70ac..d265a42b3 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -72,9 +72,7 @@ InventoryWindow *inventoryWindow = nullptr; InventoryWindow *storageWindow = nullptr; -#ifdef EATHENA_SUPPORT InventoryWindow *cartWindow = nullptr; -#endif InventoryWindow::WindowList InventoryWindow::invInstances; InsertCardListener insertCardListener; @@ -124,11 +122,9 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : case InventoryType::Inventory: case InventoryType::Trade: case InventoryType::Npc: -#ifdef EATHENA_SUPPORT case InventoryType::Vending: case InventoryType::Mail: case InventoryType::Craft: -#endif case InventoryType::TypeEnd: default: mSortDropDown->setSelected(config.getIntValue( @@ -138,12 +134,10 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : mSortDropDown->setSelected(config.getIntValue( "storageSortOrder")); break; -#ifdef EATHENA_SUPPORT case InventoryType::Cart: mSortDropDown->setSelected(config.getIntValue( "cartSortOrder")); break; -#endif }; } else @@ -285,7 +279,6 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : break; } -#ifdef EATHENA_SUPPORT case InventoryType::Cart: { // TRANSLATORS: storage button @@ -315,16 +308,13 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : place(6, 6, mInvCloseButton); break; } -#endif default: case InventoryType::Trade: case InventoryType::Npc: -#ifdef EATHENA_SUPPORT case InventoryType::Vending: case InventoryType::Mail: case InventoryType::Craft: -#endif case InventoryType::TypeEnd: break; }; @@ -382,11 +372,9 @@ void InventoryWindow::storeSortOrder() const case InventoryType::Inventory: case InventoryType::Trade: case InventoryType::Npc: -#ifdef EATHENA_SUPPORT case InventoryType::Vending: case InventoryType::Mail: case InventoryType::Craft: -#endif case InventoryType::TypeEnd: default: config.setValue("inventorySortOrder", @@ -396,12 +384,10 @@ void InventoryWindow::storeSortOrder() const config.setValue("storageSortOrder", mSortDropDown->getSelected()); break; -#ifdef EATHENA_SUPPORT case InventoryType::Cart: config.setValue("cartSortOrder", mSortDropDown->getSelected()); break; -#endif }; } } @@ -444,13 +430,11 @@ void InventoryWindow::action(const ActionEvent &event) ItemAmountWindow::showWindow(ItemAmountWindowUsage::StoreAdd, this, item); } -#ifdef EATHENA_SUPPORT else if (cartWindow && cartWindow->isWindowVisible()) { ItemAmountWindow::showWindow(ItemAmountWindowUsage::CartAdd, this, item); } -#endif } else if (eventId == "sort") { @@ -492,7 +476,6 @@ void InventoryWindow::action(const ActionEvent &event) item->getQuantity(), InventoryType::Storage); } -#ifdef EATHENA_SUPPORT else if (cartWindow && cartWindow->isWindowVisible()) { inventoryHandler->moveItem2(InventoryType::Inventory, @@ -501,7 +484,6 @@ void InventoryWindow::action(const ActionEvent &event) InventoryType::Cart); } else -#endif { if (PlayerInfo::isItemProtected(item->getId())) return; @@ -530,13 +512,11 @@ void InventoryWindow::action(const ActionEvent &event) ItemAmountWindow::showWindow(ItemAmountWindowUsage::StoreRemove, this, item); } -#ifdef EATHENA_SUPPORT else if (cartWindow && cartWindow->isWindowVisible()) { ItemAmountWindow::showWindow(ItemAmountWindowUsage::CartRemove, this, item); } -#endif } } @@ -824,9 +804,7 @@ void InventoryWindow::close() switch (mInventory->getType()) { case InventoryType::Inventory: -#ifdef EATHENA_SUPPORT case InventoryType::Cart: -#endif setVisible(Visible_false); break; @@ -842,11 +820,9 @@ void InventoryWindow::close() default: case InventoryType::Trade: case InventoryType::Npc: -#ifdef EATHENA_SUPPORT case InventoryType::Vending: case InventoryType::Mail: case InventoryType::Craft: -#endif case InventoryType::TypeEnd: break; } @@ -857,12 +833,8 @@ void InventoryWindow::updateWeight() if (!mInventory || !mWeightBar) return; const InventoryTypeT type = mInventory->getType(); -#ifdef EATHENA_SUPPORT if (type != InventoryType::Inventory && type != InventoryType::Cart) -#else - if (type != InventoryType::Inventory) -#endif { return; } @@ -907,11 +879,7 @@ void InventoryWindow::updateDropButton() if (!mDropButton) return; -#ifdef EATHENA_SUPPORT if (isStorageActive() || (cartWindow && cartWindow->isWindowVisible())) -#else - if (isStorageActive()) -#endif { // TRANSLATORS: inventory button mDropButton->setCaption(_("Store")); @@ -981,12 +949,8 @@ void InventoryWindow::widgetResized(const Event &event) if (!mInventory) return; const InventoryTypeT type = mInventory->getType(); -#ifdef EATHENA_SUPPORT if (type != InventoryType::Inventory && type != InventoryType::Cart) -#else - if (type != InventoryType::Inventory) -#endif { return; } @@ -1041,7 +1005,6 @@ void InventoryWindow::attributeChanged(const AttributesT id, } } -#ifdef EATHENA_SUPPORT void InventoryWindow::combineItems(const int index1, const int index2) { @@ -1104,4 +1067,3 @@ void InventoryWindow::moveItemToCraft(const int craftSlot) } } } -#endif diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index e19b219f8..90cf64ee0 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -46,9 +46,7 @@ class TextField; extern InventoryWindow *inventoryWindow; extern InventoryWindow *storageWindow; -#ifdef EATHENA_SUPPORT extern InventoryWindow *cartWindow; -#endif // EATHENA_SUPPORT /** * Inventory dialog. @@ -156,12 +154,10 @@ class InventoryWindow final : public Window, const int oldVal, const int newVal) override final; -#ifdef EATHENA_SUPPORT void combineItems(const int index1, const int index2); void moveItemToCraft(const int craftSlot); -#endif static bool isAnyInputFocused(); diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index b3fdf4a62..54e856539 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -33,9 +33,7 @@ #include "gui/popups/itempopup.h" #include "gui/windows/maileditwindow.h" -#ifdef EATHENA_SUPPORT #include "gui/windows/npcdialog.h" -#endif // EATHENA_SUPPORT #include "gui/windows/shopwindow.h" #include "gui/windows/tradewindow.h" @@ -49,9 +47,7 @@ #include "gui/widgets/slider.h" #include "net/inventoryhandler.h" -#ifdef EATHENA_SUPPORT #include "net/npchandler.h" -#endif // EATHENA_SUPPORT #include "resources/item/item.h" @@ -98,7 +94,6 @@ void ItemAmountWindow::finish(Item *const item, if (shopWindow) shopWindow->addSellItem(item, amount, price); break; -#ifdef EATHENA_SUPPORT case ItemAmountWindowUsage::CartAdd: inventoryHandler->moveItem2(InventoryType::Inventory, item->getInvIndex(), amount, InventoryType::Cart); @@ -118,7 +113,6 @@ void ItemAmountWindow::finish(Item *const item, dialog->addCraftItem(item, amount, price); // price as slot break; } -#endif default: break; } @@ -264,7 +258,6 @@ ItemAmountWindow::ItemAmountWindow(const ItemAmountWindowUsageT usage, // TRANSLATORS: amount window message setCaption(_("Select amount of items to store.")); break; -#ifdef EATHENA_SUPPORT case ItemAmountWindowUsage::MailAdd: // TRANSLATORS: amount window message setCaption(_("Select amount of items to send.")); @@ -273,7 +266,6 @@ ItemAmountWindow::ItemAmountWindow(const ItemAmountWindowUsageT usage, // TRANSLATORS: amount window message setCaption(_("Select amount of items to craft.")); break; -#endif case ItemAmountWindowUsage::CartAdd: // TRANSLATORS: amount window message setCaption(_("Select amount of items to store to cart.")); @@ -365,7 +357,6 @@ void ItemAmountWindow::action(const ActionEvent &event) } else { -#ifdef EATHENA_SUPPORT if (mUsage == ItemAmountWindowUsage::CraftAdd) { finish(mItem, @@ -374,7 +365,6 @@ void ItemAmountWindow::action(const ActionEvent &event) mUsage); } else -#endif { finish(mItem, mItemAmountTextField->getValue(), @@ -488,23 +478,16 @@ void ItemAmountWindow::showWindow(const ItemAmountWindowUsageT usage, usage != ItemAmountWindowUsage::ShopSellAdd && maxRange <= 1) { -#ifdef EATHENA_SUPPORT if (usage == ItemAmountWindowUsage::CraftAdd) finish(item, maxRange, tag, usage); else -#endif finish(item, maxRange, 0, usage); } else { -#ifdef EATHENA_SUPPORT ItemAmountWindow *const window = CREATEWIDGETR(ItemAmountWindow, usage, parent, item, maxRange); if (usage == ItemAmountWindowUsage::CraftAdd) window->mPrice = tag; -#else - CREATEWIDGET(ItemAmountWindow, - usage, parent, item, maxRange); -#endif } } diff --git a/src/gui/windows/maileditwindow.h b/src/gui/windows/maileditwindow.h index 097820366..0ec83b0f7 100644 --- a/src/gui/windows/maileditwindow.h +++ b/src/gui/windows/maileditwindow.h @@ -21,8 +21,6 @@ #ifndef GUI_WINDOWS_MAILEDITWINDOW_H #define GUI_WINDOWS_MAILEDITWINDOW_H -#ifdef EATHENA_SUPPORT - #include "gui/widgets/window.h" #include "listeners/actionlistener.h" @@ -78,5 +76,4 @@ class MailEditWindow final : public Window, extern MailEditWindow *mailEditWindow; -#endif // EATHENA_SUPPORT #endif // GUI_WINDOWS_MAILEDITWINDOW_H diff --git a/src/gui/windows/mailviewwindow.h b/src/gui/windows/mailviewwindow.h index 563f9e99f..4e2e95ddd 100644 --- a/src/gui/windows/mailviewwindow.h +++ b/src/gui/windows/mailviewwindow.h @@ -21,8 +21,6 @@ #ifndef GUI_WINDOWS_MAILVIEWWINDOW_H #define GUI_WINDOWS_MAILVIEWWINDOW_H -#ifdef EATHENA_SUPPORT - #include "gui/widgets/window.h" #include "listeners/actionlistener.h" @@ -63,5 +61,4 @@ class MailViewWindow final : public Window, extern MailViewWindow *mailViewWindow; -#endif // EATHENA_SUPPORT #endif // GUI_WINDOWS_MAILVIEWWINDOW_H diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h index 1a78c1de9..f8bf32d09 100644 --- a/src/gui/windows/mailwindow.h +++ b/src/gui/windows/mailwindow.h @@ -21,8 +21,6 @@ #ifndef GUI_WINDOWS_MAILWINDOW_H #define GUI_WINDOWS_MAILWINDOW_H -#ifdef EATHENA_SUPPORT - #include "gui/widgets/window.h" #include "listeners/actionlistener.h" @@ -84,5 +82,4 @@ class MailWindow final : public Window, extern MailWindow *mailWindow; -#endif // EATHENA_SUPPORT #endif // GUI_WINDOWS_MAILWINDOW_H diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 3450436ef..e149f06e8 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -352,12 +352,9 @@ void Minimap::draw2(Graphics *const graphics) break; case ActorType::LocalPet: -#ifdef EATHENA_SUPPORT case ActorType::Pet: -#endif type = UserColorId::PET; break; -#ifdef EATHENA_SUPPORT case ActorType::Mercenary: type = UserColorId::MERCENARY; break; @@ -369,7 +366,6 @@ void Minimap::draw2(Graphics *const graphics) case ActorType::SkillUnit: type = UserColorId::SKILLUNIT; break; -#endif case ActorType::Avatar: case ActorType::Unknown: case ActorType::Player: diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 8b850d463..16705a414 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -39,9 +39,7 @@ #include "gui/popups/popupmenu.h" -#ifdef EATHENA_SUPPORT #include "gui/windows/cutinwindow.h" -#endif #include "gui/windows/inventorywindow.h" #include "gui/widgets/browserbox.h" @@ -133,9 +131,7 @@ NpcDialog::NpcDialog(const BeingId npcId) : // TRANSLATORS: npc dialog button mResetButton(new Button(this, _("Reset"), "reset", this)), mInventory(new Inventory(InventoryType::Npc, 1)), -#ifdef EATHENA_SUPPORT mComplexInventory(new ComplexInventory(InventoryType::Craft, 1)), -#endif mItemContainer(new ItemContainer(this, mInventory, 10000, ShowEmptyRows_true)), mItemScrollArea(new ScrollArea(this, mItemContainer, @@ -268,9 +264,7 @@ NpcDialog::~NpcDialog() delete2(mItemLinkHandler); delete2(mItemContainer); delete2(mInventory); -#ifdef EATHENA_SUPPORT delete2(mComplexInventory); -#endif delete2(mItemScrollArea); delete2(mListScrollArea); delete2(mSkinScrollArea); @@ -329,10 +323,8 @@ void NpcDialog::action(const ActionEvent &event) else if (mActionState == NPC_ACTION_CLOSE || mActionState == NPC_ACTION_WAIT) { -#ifdef EATHENA_SUPPORT if (cutInWindow) cutInWindow->hide(); -#endif closeDialog(); } else if (mActionState == NPC_ACTION_INPUT) @@ -478,7 +470,6 @@ void NpcDialog::action(const ActionEvent &event) } case NPC_INPUT_ITEM_CRAFT: { -#ifdef EATHENA_SUPPORT restoreVirtuals(); if (!PacketLimiter::limitPackets( PacketType::PACKET_NPC_INPUT)) @@ -509,7 +500,6 @@ void NpcDialog::action(const ActionEvent &event) // need send selected item npcHandler->stringInput(mNpcId, str); mInventory->clear(); -#endif break; } @@ -545,9 +535,7 @@ void NpcDialog::action(const ActionEvent &event) mInventory->clear(); break; case NPC_INPUT_ITEM_CRAFT: -#ifdef EATHENA_SUPPORT mComplexInventory->clear(); -#endif break; case NPC_INPUT_NONE: case NPC_INPUT_LIST: @@ -572,9 +560,7 @@ void NpcDialog::action(const ActionEvent &event) mInventory->clear(); break; case NPC_INPUT_ITEM_CRAFT: -#ifdef EATHENA_SUPPORT mComplexInventory->clear(); -#endif break; case NPC_INPUT_STRING: case NPC_INPUT_INTEGER: @@ -609,10 +595,8 @@ void NpcDialog::action(const ActionEvent &event) npcHandler->listInput(mNpcId, 255); break; } -#ifdef EATHENA_SUPPORT if (cutInWindow) cutInWindow->hide(); -#endif closeDialog(); } } @@ -624,14 +608,12 @@ void NpcDialog::action(const ActionEvent &event) Inventory *const inventory = PlayerInfo::getInventory(); if (inventory) { -#ifdef EATHENA_SUPPORT if (mInputState == NPC_INPUT_ITEM_CRAFT) { if (mComplexInventory->addVirtualItem(item, -1, 1)) inventory->virtualRemove(item, 1); } else -#endif { if (mInventory->addVirtualItem(item, -1, 1)) inventory->virtualRemove(item, 1); @@ -814,12 +796,10 @@ void NpcDialog::itemIndexRequest(const int size) void NpcDialog::itemCraftRequest(const int size A_TMWA_UNUSED) { -#ifdef EATHENA_SUPPORT mActionState = NPC_ACTION_INPUT; mInputState = NPC_INPUT_ITEM_CRAFT; mComplexInventory->resize(size); buildLayout(); -#endif } void NpcDialog::move(const int amount) @@ -1014,11 +994,9 @@ void NpcDialog::placeItemInputControls() mItemContainer->setMaxColumns(10000); } -#ifdef EATHENA_SUPPORT if (mInputState == NPC_INPUT_ITEM_CRAFT) mItemContainer->setInventory(mComplexInventory); else -#endif mItemContainer->setInventory(mInventory); if (mDialogInfo && mDialogInfo->hideText) @@ -1402,7 +1380,6 @@ void NpcDialog::addCraftItem(Item *const item A_TMWA_UNUSED, if (!inventory) return; -#ifdef EATHENA_SUPPORT if (mComplexInventory->addVirtualItem( item, slot, @@ -1410,5 +1387,4 @@ void NpcDialog::addCraftItem(Item *const item A_TMWA_UNUSED, { inventory->virtualRemove(item, amount); } -#endif } diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index fa3e52097..1b34eebf4 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -318,9 +318,7 @@ class NpcDialog final : public Window, Button *mResetButton A_NONNULLPOINTER; Inventory *mInventory A_NONNULLPOINTER; -#ifdef EATHENA_SUPPORT ComplexInventory *mComplexInventory A_NONNULLPOINTER; -#endif ItemContainer *mItemContainer A_NONNULLPOINTER; ScrollArea *mItemScrollArea A_NONNULLPOINTER; diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index ea6511e37..6d9992cab 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -61,16 +61,10 @@ static std::string serverTypeToString(const ServerTypeT type) #else return ""; #endif -#ifdef EATHENA_SUPPORT case ServerType::EATHENA: return "eAthena"; case ServerType::EVOL2: return "Evol2"; -#else - case ServerType::EATHENA: - case ServerType::EVOL2: - return ""; -#endif default: case ServerType::UNKNOWN: return ""; @@ -84,9 +78,7 @@ static uint16_t defaultPortForServerType(const ServerTypeT type) default: case ServerType::EATHENA: case ServerType::EVOL2: -#ifdef EATHENA_SUPPORT return 6900; -#endif case ServerType::UNKNOWN: #ifdef TMWA_SUPPORT case ServerType::TMWATHENA: diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 6b7994854..cab3bcb37 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -32,9 +32,7 @@ #include "const/gui/chat.h" #endif -#ifdef EATHENA_SUPPORT #include "gui/windows/editdialog.h" -#endif #include "gui/windows/itemamountwindow.h" #include "gui/windows/setupwindow.h" @@ -51,9 +49,7 @@ #include "gui/widgets/shoplistbox.h" #include "gui/widgets/tabstrip.h" -#ifdef EATHENA_SUPPORT #include "listeners/shoprenamelistener.h" -#endif #ifdef TMWA_SUPPORT #include "actormanager.h" @@ -69,10 +65,8 @@ #include "being/playerrelations.h" #include "net/chathandler.h" #endif -#ifdef EATHENA_SUPPORT #include "net/buyingstorehandler.h" #include "net/vendinghandler.h" -#endif #include "net/serverfeatures.h" #ifdef TMWA_SUPPORT #include "net/tradehandler.h" @@ -102,12 +96,10 @@ ShopWindow::DialogList ShopWindow::instances; ShopWindow::ShopWindow() : // TRANSLATORS: shop window name Window(_("Personal Shop"), Modal_false, nullptr, "shop.xml"), -#ifdef EATHENA_SUPPORT VendingModeListener(), VendingSlotsListener(), BuyingStoreModeListener(), BuyingStoreSlotsListener(), -#endif ActionListener(), SelectionListener(), // TRANSLATORS: shop window button @@ -217,9 +209,7 @@ ShopWindow::ShopWindow() : center(); loadWindowState(); -#ifdef EATHENA_SUPPORT updateShopName(); -#endif instances.push_back(this); } @@ -308,7 +298,6 @@ void ShopWindow::action(const ActionEvent &event) isBuySelected = false; updateSelection(); } -#ifdef EATHENA_SUPPORT else if (eventId == "publish") { if (isBuySelected) @@ -378,17 +367,12 @@ void ShopWindow::action(const ActionEvent &event) shopRenameListener.setDialog(dialog); dialog->addActionListener(&shopRenameListener); } -#endif if (mSelectedItem < 1) return; -#ifdef EATHENA_SUPPORT const Inventory *const inv = mHaveVending && !isBuySelected ? PlayerInfo::getCartInventory() : PlayerInfo::getInventory(); -#else - const Inventory *const inv = PlayerInfo::getInventory(); -#endif if (!inv) return; @@ -1122,7 +1106,6 @@ void ShopWindow::updateSelection() updateButtonsAndLabels(); } -#ifdef EATHENA_SUPPORT void ShopWindow::updateShopName() { if (mSellShopName.empty()) @@ -1173,4 +1156,3 @@ void ShopWindow::buyingStoreEnabled(const bool b) mBuyShopSize = 0; updateButtonsAndLabels(); } -#endif diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h index 8bd5e5d2a..3123178e7 100644 --- a/src/gui/windows/shopwindow.h +++ b/src/gui/windows/shopwindow.h @@ -47,12 +47,10 @@ class TabStrip; * \ingroup Interface */ class ShopWindow final : public Window, -#ifdef EATHENA_SUPPORT public VendingModeListener, public VendingSlotsListener, public BuyingStoreModeListener, public BuyingStoreSlotsListener, -#endif public ActionListener, public SelectionListener { @@ -148,7 +146,6 @@ class ShopWindow final : public Window, bool isShopEmpty() const A_WARN_UNUSED; -#ifdef EATHENA_SUPPORT void vendingEnabled(const bool b) override final; void vendingSlotsChanged(const int slots) override final; @@ -158,18 +155,14 @@ class ShopWindow final : public Window, void buyingStoreSlotsChanged(const int slots) override final; void setShopName(const std::string &name); -#endif private: #ifdef TMWA_SUPPORT void startTrade(); #endif - void updateSelection(); -#ifdef EATHENA_SUPPORT void updateShopName(); -#endif typedef std::list<ShopWindow*> DialogList; static DialogList instances; diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index e7cdfb4b2..9133be6ac 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -739,9 +739,7 @@ void InputManager::updateConditionMask() restrict2 if (!PlayerInfo::isVending()) mMask |= InputCondition::NOVENDING; -#ifdef EATHENA_SUPPORT if (!PlayerInfo::isInRoom()) -#endif mMask |= InputCondition::NOROOM; const NpcDialog *restrict const dialog = NpcDialog::getActive(); diff --git a/src/listeners/banklistener.h b/src/listeners/banklistener.h index 0f0454017..e981374b4 100644 --- a/src/listeners/banklistener.h +++ b/src/listeners/banklistener.h @@ -21,8 +21,6 @@ #ifndef LISTENERS_BANKLISTENER_H #define LISTENERS_BANKLISTENER_H -#ifdef EATHENA_SUPPORT - #include "listeners/baselistener.hpp" #include "localconsts.h" @@ -37,5 +35,4 @@ class BankListener notfinal defineListenerHeader(BankListener) }; -#endif // EATHENA_SUPPORT #endif // LISTENERS_BANKLISTENER_H diff --git a/src/listeners/buyingstoremodelistener.h b/src/listeners/buyingstoremodelistener.h index 11ba6b741..13157774e 100644 --- a/src/listeners/buyingstoremodelistener.h +++ b/src/listeners/buyingstoremodelistener.h @@ -21,8 +21,6 @@ #ifndef LISTENERS_BUYINGSTOREMODELISTENER_H #define LISTENERS_BUYINGSTOREMODELISTENER_H -#ifdef EATHENA_SUPPORT - #include "listeners/baselistener.hpp" #include "localconsts.h" @@ -37,5 +35,4 @@ class BuyingStoreModeListener notfinal defineListenerHeader(BuyingStoreModeListener) }; -#endif // EATHENA_SUPPORT #endif // LISTENERS_BUYINGSTOREMODELISTENER_H diff --git a/src/listeners/buyingstoreslotslistener.h b/src/listeners/buyingstoreslotslistener.h index 457abcf87..3ab3f63a2 100644 --- a/src/listeners/buyingstoreslotslistener.h +++ b/src/listeners/buyingstoreslotslistener.h @@ -21,8 +21,6 @@ #ifndef LISTENERS_BUYINGSTORESLOTSLISTENER_H #define LISTENERS_BUYINGSTORESLOTSLISTENER_H -#ifdef EATHENA_SUPPORT - #include "listeners/baselistener.hpp" #include "localconsts.h" @@ -37,5 +35,4 @@ class BuyingStoreSlotsListener notfinal defineListenerHeader(BuyingStoreSlotsListener) }; -#endif // EATHENA_SUPPORT #endif // LISTENERS_BUYINGSTORESLOTSLISTENER_H diff --git a/src/listeners/pincodelistener.h b/src/listeners/pincodelistener.h index 8921b9a70..922ee80e9 100644 --- a/src/listeners/pincodelistener.h +++ b/src/listeners/pincodelistener.h @@ -21,8 +21,6 @@ #ifndef LISTENERS_PINCODELISTENER_H #define LISTENERS_PINCODELISTENER_H -#ifdef EATHENA_SUPPORT - #include "listeners/actionlistener.h" #include "localconsts.h" @@ -35,5 +33,4 @@ class PincodeListener final : public ActionListener extern PincodeListener pincodeListener; -#endif // EATHENA_SUPPORT #endif // LISTENERS_PINCODELISTENER_H diff --git a/src/listeners/requestadoptchildlistener.h b/src/listeners/requestadoptchildlistener.h index 9d90fae75..b858109a5 100644 --- a/src/listeners/requestadoptchildlistener.h +++ b/src/listeners/requestadoptchildlistener.h @@ -21,8 +21,6 @@ #ifndef LISTENERS_REQUESTADOPTCHILDLISTENER_H #define LISTENERS_REQUESTADOPTCHILDLISTENER_H -#ifdef EATHENA_SUPPORT - #include "gui/windows/confirmdialog.h" #include "net/familyhandler.h" @@ -39,5 +37,4 @@ struct RequestAdoptChildListener final : public ActionListener } }; -#endif // EATHENA_SUPPORT #endif // LISTENERS_REQUESTADOPTCHILDLISTENER_H diff --git a/src/listeners/shoprenamelistener.h b/src/listeners/shoprenamelistener.h index 5ca3fcbd6..5f3beefc7 100644 --- a/src/listeners/shoprenamelistener.h +++ b/src/listeners/shoprenamelistener.h @@ -21,8 +21,6 @@ #ifndef LISTENERS_SHOPRENAMELISTENER_H #define LISTENERS_SHOPRENAMELISTENER_H -#ifdef EATHENA_SUPPORT - #include "listeners/actionlistener.h" #include "localconsts.h" @@ -47,5 +45,4 @@ class ShopRenameListener final : public ActionListener extern ShopRenameListener shopRenameListener; -#endif // EATHENA_SUPPORT #endif // LISTENERS_SHOPRENAMELISTENER_H diff --git a/src/listeners/skillwarplistener.h b/src/listeners/skillwarplistener.h index f7f2f230d..abf618d1f 100644 --- a/src/listeners/skillwarplistener.h +++ b/src/listeners/skillwarplistener.h @@ -21,8 +21,6 @@ #ifndef LISTENERS_SKILLWARPLISTENER_H #define LISTENERS_SKILLWARPLISTENER_H -#ifdef EATHENA_SUPPORT - #include "listeners/actionlistener.h" #include "localconsts.h" @@ -51,5 +49,4 @@ class SkillWarpListener final : public ActionListener extern SkillWarpListener skillWarpListener; -#endif // EATHENA_SUPPORT #endif // LISTENERS_SKILLWARPLISTENER_H diff --git a/src/listeners/vendingmodelistener.h b/src/listeners/vendingmodelistener.h index 551d48639..89154fdf8 100644 --- a/src/listeners/vendingmodelistener.h +++ b/src/listeners/vendingmodelistener.h @@ -21,8 +21,6 @@ #ifndef LISTENERS_VENDINGMODELISTENER_H #define LISTENERS_VENDINGMODELISTENER_H -#ifdef EATHENA_SUPPORT - #include "listeners/baselistener.hpp" #include "localconsts.h" @@ -37,5 +35,4 @@ class VendingModeListener notfinal defineListenerHeader(VendingModeListener) }; -#endif // EATHENA_SUPPORT #endif // LISTENERS_VENDINGMODELISTENER_H diff --git a/src/listeners/vendingslotslistener.h b/src/listeners/vendingslotslistener.h index a51b6ca2e..dbca3d838 100644 --- a/src/listeners/vendingslotslistener.h +++ b/src/listeners/vendingslotslistener.h @@ -21,8 +21,6 @@ #ifndef LISTENERS_VENDINGSLOTSLISTENER_H #define LISTENERS_VENDINGSLOTSLISTENER_H -#ifdef EATHENA_SUPPORT - #include "listeners/baselistener.hpp" #include "localconsts.h" @@ -37,5 +35,4 @@ class VendingSlotsListener notfinal defineListenerHeader(VendingSlotsListener) }; -#endif // EATHENA_SUPPORT #endif // LISTENERS_VENDINGSLOTSLISTENER_H diff --git a/src/localconsts.h b/src/localconsts.h index 12c14a5e7..83d843c3c 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -97,11 +97,7 @@ #define A_UNUSED __attribute__ ((unused)) #define A_WARN_UNUSED __attribute__ ((warn_unused_result)) #define DEPRECATED __attribute__ ((deprecated)) -#ifndef EATHENA_SUPPORT -#define A_TMWA_UNUSED __attribute__ ((unused)) -#else // EATHENA_SUPPORT #define A_TMWA_UNUSED -#endif // EATHENA_SUPPORT #ifdef DYECMD #define A_DYECMD_UNUSED __attribute__ ((unused)) #else // DYECMD diff --git a/src/net/auctionhandler.h b/src/net/auctionhandler.h index 75057740c..65b9ed1f2 100644 --- a/src/net/auctionhandler.h +++ b/src/net/auctionhandler.h @@ -21,8 +21,6 @@ #ifndef NET_AUCTIONHANDLER_H #define NET_AUCTIONHANDLER_H -#ifdef EATHENA_SUPPORT - #include "enums/net/auctionsearchtype.h" #include <string> @@ -70,5 +68,4 @@ class AuctionHandler notfinal extern Net::AuctionHandler *auctionHandler; -#endif // EATHENA_SUPPORT #endif // NET_AUCTIONHANDLER_H diff --git a/src/net/bankhandler.h b/src/net/bankhandler.h index 5853e84c9..f469aa320 100644 --- a/src/net/bankhandler.h +++ b/src/net/bankhandler.h @@ -21,8 +21,6 @@ #ifndef NET_BANKHANDLER_H #define NET_BANKHANDLER_H -#ifdef EATHENA_SUPPORT - #include "localconsts.h" namespace Net @@ -49,5 +47,4 @@ class BankHandler notfinal extern Net::BankHandler *bankHandler; -#endif // EATHENA_SUPPORT #endif // NET_BANKHANDLER_H diff --git a/src/net/battlegroundhandler.h b/src/net/battlegroundhandler.h index fb24e8243..2706e7ce8 100644 --- a/src/net/battlegroundhandler.h +++ b/src/net/battlegroundhandler.h @@ -21,8 +21,6 @@ #ifndef NET_BATTLEGROUNDHANDLER_H #define NET_BATTLEGROUNDHANDLER_H -#ifdef EATHENA_SUPPORT - #include "enums/net/battlegroundtype.h" #include <string> @@ -54,5 +52,4 @@ class BattleGroundHandler notfinal extern Net::BattleGroundHandler *battleGroundHandler; -#endif // EATHENA_SUPPORT #endif // NET_BATTLEGROUNDHANDLER_H diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h index ac8495a5b..ea2f36030 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -41,11 +41,9 @@ class BeingHandler notfinal virtual void undress(Being *const being) const = 0; -#ifdef EATHENA_SUPPORT virtual void requestRanks(const RankT rank) const = 0; virtual void viewPlayerEquipment(const Being *const being) const = 0; -#endif }; } // namespace Net diff --git a/src/net/buyingstorehandler.h b/src/net/buyingstorehandler.h index 3d994b2bc..74dcc5f6b 100644 --- a/src/net/buyingstorehandler.h +++ b/src/net/buyingstorehandler.h @@ -21,8 +21,6 @@ #ifndef NET_BUYINGSTOREHANDLER_H #define NET_BUYINGSTOREHANDLER_H -#ifdef EATHENA_SUPPORT - #include <string> #include <vector> @@ -60,5 +58,4 @@ class BuyingStoreHandler notfinal extern Net::BuyingStoreHandler *buyingStoreHandler; -#endif // EATHENA_SUPPORT #endif // NET_BUYINGSTOREHANDLER_H diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h index 2c4df7073..f66d29297 100644 --- a/src/net/cashshophandler.h +++ b/src/net/cashshophandler.h @@ -21,8 +21,6 @@ #ifndef NET_CASHSHOPHANDLER_H #define NET_CASHSHOPHANDLER_H -#ifdef EATHENA_SUPPORT - #include "enums/simpletypes/itemcolor.h" #include <vector> @@ -60,5 +58,4 @@ class CashShopHandler notfinal extern Net::CashShopHandler *cashShopHandler; -#endif // EATHENA_SUPPORT #endif // NET_CASHSHOPHANDLER_H diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 9a3b5a442..408b1bcb5 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -87,12 +87,10 @@ size_t InventoryHandler::getSize(const InventoryTypeT type) const case InventoryType::Trade: return 12; case InventoryType::Npc: -#ifdef EATHENA_SUPPORT case InventoryType::Cart: case InventoryType::Vending: case InventoryType::Mail: case InventoryType::Craft: -#endif case InventoryType::TypeEnd: default: return 0; diff --git a/src/net/eathena/auctionhandler.h b/src/net/eathena/auctionhandler.h index b7c15125f..208460daa 100644 --- a/src/net/eathena/auctionhandler.h +++ b/src/net/eathena/auctionhandler.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_AUCTIONHANDLER_H #define NET_EATHENA_AUCTIONHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/auctionhandler.h" namespace EAthena @@ -62,5 +60,4 @@ class AuctionHandler final : public Net::AuctionHandler } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_AUCTIONHANDLER_H diff --git a/src/net/eathena/auctionrecv.h b/src/net/eathena/auctionrecv.h index 9858e19ea..9a60dc515 100644 --- a/src/net/eathena/auctionrecv.h +++ b/src/net/eathena/auctionrecv.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_AUCTIONRECV_H #define NET_EATHENA_AUCTIONRECV_H -#ifdef EATHENA_SUPPORT - namespace Net { class MessageIn; @@ -40,5 +38,4 @@ namespace EAthena } // namespace Admin } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_AUCTIONRECV_H diff --git a/src/net/eathena/bankhandler.h b/src/net/eathena/bankhandler.h index 252620045..0935c21b8 100644 --- a/src/net/eathena/bankhandler.h +++ b/src/net/eathena/bankhandler.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_BANKHANDLER_H #define NET_EATHENA_BANKHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/bankhandler.h" namespace EAthena @@ -47,5 +45,4 @@ class BankHandler final : public Net::BankHandler } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_BANKHANDLER_H diff --git a/src/net/eathena/bankrecv.h b/src/net/eathena/bankrecv.h index 5d4d65032..39ca6ba59 100644 --- a/src/net/eathena/bankrecv.h +++ b/src/net/eathena/bankrecv.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_BANKRECV_H #define NET_EATHENA_BANKRECV_H -#ifdef EATHENA_SUPPORT - namespace Net { class MessageIn; @@ -38,5 +36,4 @@ namespace EAthena } // namespace BankRecv } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_BANKRECV_H diff --git a/src/net/eathena/battlegroundhandler.h b/src/net/eathena/battlegroundhandler.h index b87420d3f..c51e3af8b 100644 --- a/src/net/eathena/battlegroundhandler.h +++ b/src/net/eathena/battlegroundhandler.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_BATTLEGROUNDHANDLER_H #define NET_EATHENA_BATTLEGROUNDHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/battlegroundhandler.h" namespace EAthena @@ -48,5 +46,4 @@ class BattleGroundHandler final : public Net::BattleGroundHandler } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_BATTLEGROUNDHANDLER_H diff --git a/src/net/eathena/battlegroundrecv.h b/src/net/eathena/battlegroundrecv.h index 59b3e18ce..ef7de8a1c 100644 --- a/src/net/eathena/battlegroundrecv.h +++ b/src/net/eathena/battlegroundrecv.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_BATTLEGROUNDRECV_H #define NET_EATHENA_BATTLEGROUNDRECV_H -#ifdef EATHENA_SUPPORT - namespace Net { class MessageIn; @@ -45,5 +43,4 @@ namespace EAthena } // namespace BattleGroundRecv } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_BATTLEGROUNDRECV_H diff --git a/src/net/eathena/buyingstorehandler.h b/src/net/eathena/buyingstorehandler.h index f271dc60d..2ccf9792f 100644 --- a/src/net/eathena/buyingstorehandler.h +++ b/src/net/eathena/buyingstorehandler.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_BUYINGSTOREHANDLER_H #define NET_EATHENA_BUYINGSTOREHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/buyingstorehandler.h" namespace EAthena @@ -51,5 +49,4 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_BUYINGSTOREHANDLER_H diff --git a/src/net/eathena/buyingstorerecv.h b/src/net/eathena/buyingstorerecv.h index ea0f76b00..82b9182a6 100644 --- a/src/net/eathena/buyingstorerecv.h +++ b/src/net/eathena/buyingstorerecv.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_BUYINGSTORERECV_H #define NET_EATHENA_BUYINGSTORERECV_H -#ifdef EATHENA_SUPPORT - namespace Net { class MessageIn; @@ -54,5 +52,4 @@ namespace EAthena } // namespace BuyingStoreRecv } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_BUYINGSTORERECV_H diff --git a/src/net/eathena/cashshophandler.h b/src/net/eathena/cashshophandler.h index 7d7fe1fbc..98030fa54 100644 --- a/src/net/eathena/cashshophandler.h +++ b/src/net/eathena/cashshophandler.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_CASHSHOPHANDLER_H #define NET_EATHENA_CASHSHOPHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/cashshophandler.h" namespace EAthena @@ -53,5 +51,4 @@ class CashShopHandler final : public Net::CashShopHandler } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_CASHSHOPHANDLER_H diff --git a/src/net/eathena/cashshoprecv.h b/src/net/eathena/cashshoprecv.h index d302d5b6b..ad0dcd7ac 100644 --- a/src/net/eathena/cashshoprecv.h +++ b/src/net/eathena/cashshoprecv.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_CASHSHOPRECV_H #define NET_EATHENA_CASHSHOPRECV_H -#ifdef EATHENA_SUPPORT - namespace Net { class MessageIn; @@ -44,5 +42,4 @@ namespace EAthena } // namespace CashShopRecv } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_CASHSHOPRECV_H diff --git a/src/net/eathena/familyhandler.h b/src/net/eathena/familyhandler.h index 0865dcdf9..ca3790126 100644 --- a/src/net/eathena/familyhandler.h +++ b/src/net/eathena/familyhandler.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_FAMILYHANDLER_H #define NET_EATHENA_FAMILYHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/familyhandler.h" namespace EAthena @@ -41,5 +39,4 @@ class FamilyHandler final : public Net::FamilyHandler } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_FAMILYHANDLER_H diff --git a/src/net/eathena/familyrecv.h b/src/net/eathena/familyrecv.h index 0ce18bf7f..51f4c10ec 100644 --- a/src/net/eathena/familyrecv.h +++ b/src/net/eathena/familyrecv.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_FAMILYRECV_H #define NET_EATHENA_FAMILYRECV_H -#ifdef EATHENA_SUPPORT - #include "enums/simpletypes/beingid.h" namespace Net @@ -44,5 +42,4 @@ namespace EAthena } // namespace FamilyRecv } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_FAMILYRECV_H diff --git a/src/net/eathena/friendshandler.h b/src/net/eathena/friendshandler.h index ac1e8f3d1..1f2804f03 100644 --- a/src/net/eathena/friendshandler.h +++ b/src/net/eathena/friendshandler.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_FRIENDSHANDLER_H #define NET_EATHENA_FRIENDSHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/friendshandler.h" namespace EAthena @@ -46,5 +44,4 @@ class FriendsHandler final : public Net::FriendsHandler } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_FRIENDSHANDLER_H diff --git a/src/net/eathena/friendsrecv.h b/src/net/eathena/friendsrecv.h index e1bb04da7..0aa03f1da 100644 --- a/src/net/eathena/friendsrecv.h +++ b/src/net/eathena/friendsrecv.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_FRIENDSRECV_H #define NET_EATHENA_FRIENDSRECV_H -#ifdef EATHENA_SUPPORT - namespace Net { class MessageIn; @@ -40,5 +38,4 @@ namespace EAthena } // namespace FriendsRecv } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_FRIENDSRECV_H diff --git a/src/net/eathena/homunculushandler.h b/src/net/eathena/homunculushandler.h index e1262f6e9..1ecfda4e2 100644 --- a/src/net/eathena/homunculushandler.h +++ b/src/net/eathena/homunculushandler.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_HOMUNCULUSHANDLER_H #define NET_EATHENA_HOMUNCULUSHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/homunculushandler.h" namespace EAthena @@ -56,5 +54,4 @@ class HomunculusHandler final : public Net::HomunculusHandler } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_HOMUNCULUSHANDLER_H diff --git a/src/net/eathena/homunculusrecv.h b/src/net/eathena/homunculusrecv.h index 76ddcf544..5184d0b6c 100644 --- a/src/net/eathena/homunculusrecv.h +++ b/src/net/eathena/homunculusrecv.h @@ -21,8 +21,6 @@ #ifndef NET_EATHENA_HOMUNCULUSRECV_H #define NET_EATHENA_HOMUNCULUSRECV_H -#ifdef EATHENA_SUPPORT - namespace Net { class MessageIn; @@ -41,5 +39,4 @@ namespace EAthena } // namespace HomunculusRecv } // namespace EAthena -#endif // EATHENA_SUPPORT #endif // NET_EATHENA_HOMUNCULUSRECV_H diff --git a/src/net/elementalhandler.h b/src/net/elementalhandler.h index 93558830d..a07b9285e 100644 --- a/src/net/elementalhandler.h +++ b/src/net/elementalhandler.h @@ -21,8 +21,6 @@ #ifndef NET_ELEMENTALHANDLER_H #define NET_ELEMENTALHANDLER_H -#ifdef EATHENA_SUPPORT - #include "localconsts.h" namespace Net @@ -39,5 +37,4 @@ class ElementalHandler notfinal extern Net::ElementalHandler *elementalHandler; -#endif // EATHENA_SUPPORT #endif // NET_ELEMENTALHANDLER_H diff --git a/src/net/familyhandler.h b/src/net/familyhandler.h index 32ef030b4..5297e4385 100644 --- a/src/net/familyhandler.h +++ b/src/net/familyhandler.h @@ -21,8 +21,6 @@ #ifndef NET_FAMILYHANDLER_H #define NET_FAMILYHANDLER_H -#ifdef EATHENA_SUPPORT - #include "localconsts.h" class Being; @@ -45,5 +43,4 @@ class FamilyHandler notfinal extern Net::FamilyHandler *familyHandler; -#endif // EATHENA_SUPPORT #endif // NET_FAMILYHANDLER_H diff --git a/src/net/friendshandler.h b/src/net/friendshandler.h index 9ae9e6e9e..af3709aae 100644 --- a/src/net/friendshandler.h +++ b/src/net/friendshandler.h @@ -21,8 +21,6 @@ #ifndef NET_FRIENDSHANDLER_H #define NET_FRIENDSHANDLER_H -#ifdef EATHENA_SUPPORT - #include <string> #include "localconsts.h" @@ -49,5 +47,4 @@ class FriendsHandler notfinal extern Net::FriendsHandler *friendsHandler; -#endif // EATHENA_SUPPORT #endif // NET_FRIENDSHANDLER_H diff --git a/src/net/homunculushandler.h b/src/net/homunculushandler.h index 8f3c7dab9..f5e5b1347 100644 --- a/src/net/homunculushandler.h +++ b/src/net/homunculushandler.h @@ -21,8 +21,6 @@ #ifndef NET_HOMUNCULUSHANDLER_H #define NET_HOMUNCULUSHANDLER_H -#ifdef EATHENA_SUPPORT - #include "enums/simpletypes/beingid.h" #include "enums/simpletypes/keep.h" @@ -63,5 +61,4 @@ class HomunculusHandler notfinal extern Net::HomunculusHandler *homunculusHandler; -#endif // EATHENA_SUPPORT #endif // NET_HOMUNCULUSHANDLER_H diff --git a/src/net/mailhandler.h b/src/net/mailhandler.h index f14e8f00d..95dbdfa8b 100644 --- a/src/net/mailhandler.h +++ b/src/net/mailhandler.h @@ -21,8 +21,6 @@ #ifndef NET_MAILHANDLER_H #define NET_MAILHANDLER_H -#ifdef EATHENA_SUPPORT - #include <string> #include "localconsts.h" @@ -61,5 +59,4 @@ class MailHandler notfinal extern Net::MailHandler *mailHandler; -#endif // EATHENA_SUPPORT #endif // NET_MAILHANDLER_H diff --git a/src/net/maphandler.h b/src/net/maphandler.h index 61d47bf82..d59c4bc37 100644 --- a/src/net/maphandler.h +++ b/src/net/maphandler.h @@ -21,8 +21,6 @@ #ifndef NET_MAPHANDLER_H #define NET_MAPHANDLER_H -#ifdef EATHENA_SUPPORT - #include "localconsts.h" namespace Net @@ -39,5 +37,4 @@ class MapHandler notfinal extern Net::MapHandler *mapHandler; -#endif // EATHENA_SUPPORT #endif // NET_MAPHANDLER_H diff --git a/src/net/markethandler.h b/src/net/markethandler.h index 4ebbb6e61..433a586e4 100644 --- a/src/net/markethandler.h +++ b/src/net/markethandler.h @@ -21,8 +21,6 @@ #ifndef NET_MARKETHANDLER_H #define NET_MARKETHANDLER_H -#ifdef EATHENA_SUPPORT - #include "enums/resources/itemtype.h" #include "enums/simpletypes/itemcolor.h" @@ -56,5 +54,4 @@ class MarketHandler notfinal extern Net::MarketHandler *marketHandler; -#endif // EATHENA_SUPPORT #endif // NET_MARKETHANDLER_H diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h index 83ec9c94b..f194d9d96 100644 --- a/src/net/mercenaryhandler.h +++ b/src/net/mercenaryhandler.h @@ -21,8 +21,6 @@ #ifndef NET_MERCENARYHANDLER_H #define NET_MERCENARYHANDLER_H -#ifdef EATHENA_SUPPORT - #include "enums/simpletypes/beingid.h" #include "enums/simpletypes/keep.h" @@ -59,5 +57,4 @@ class MercenaryHandler notfinal extern Net::MercenaryHandler *mercenaryHandler; -#endif // EATHENA_SUPPORT #endif // NET_MERCENARYHANDLER_H diff --git a/src/net/net.cpp b/src/net/net.cpp index ca2d07838..9b6be857a 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -30,15 +30,12 @@ #include "net/tmwa/generalhandler.h" #endif -#ifdef EATHENA_SUPPORT #include "net/eathena/generalhandler.h" -#endif #include "debug.h" namespace Net { -#ifdef EATHENA_SUPPORT class AuctionHandler; class BankHandler; class BattleGroundHandler; @@ -55,7 +52,6 @@ namespace Net class SearchStoreHandler; class RouletteHandler; class VendingHandler; -#endif class AdminHandler; class BeingHandler; class BuySellHandler; @@ -91,7 +87,6 @@ Net::TradeHandler *tradeHandler = nullptr; Net::BeingHandler *beingHandler = nullptr; Net::BuySellHandler *buySellHandler = nullptr; Net::ServerFeatures *serverFeatures = nullptr; -#ifdef EATHENA_SUPPORT Net::AuctionHandler *auctionHandler = nullptr; Net::BankHandler *bankHandler = nullptr; Net::BattleGroundHandler *battleGroundHandler = nullptr; @@ -108,7 +103,6 @@ Net::MercenaryHandler *mercenaryHandler = nullptr; Net::RouletteHandler *rouletteHandler = nullptr; Net::SearchStoreHandler *searchStoreHandler = nullptr; Net::VendingHandler *vendingHandler = nullptr; -#endif Net::QuestHandler *questHandler = nullptr; namespace Net @@ -132,11 +126,7 @@ void connectToServer(const ServerInfo &server) { case ServerType::EATHENA: case ServerType::EVOL2: -#ifdef EATHENA_SUPPORT new EAthena::GeneralHandler; -#else - new TmwAthena::GeneralHandler; -#endif break; case ServerType::TMWATHENA: case ServerType::UNKNOWN: diff --git a/src/net/npchandler.h b/src/net/npchandler.h index 529765bb0..7ee51dcf2 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -92,10 +92,8 @@ class NpcHandler notfinal const int materialId2, const int materialId3) const = 0; -#ifdef EATHENA_SUPPORT virtual void cooking(const CookingTypeT type, const int nameId) const = 0; -#endif virtual void repair(const int index) const = 0; diff --git a/src/net/roulettehandler.h b/src/net/roulettehandler.h index 66bda0b1d..29987fec0 100644 --- a/src/net/roulettehandler.h +++ b/src/net/roulettehandler.h @@ -21,8 +21,6 @@ #ifndef NET_ROULETTEHANDLER_H #define NET_ROULETTEHANDLER_H -#ifdef EATHENA_SUPPORT - #include "localconsts.h" namespace Net @@ -39,5 +37,4 @@ class RouletteHandler notfinal extern Net::RouletteHandler *rouletteHandler; -#endif // EATHENA_SUPPORT #endif // NET_ROULETTEHANDLER_H diff --git a/src/net/searchstorehandler.h b/src/net/searchstorehandler.h index 1b903793d..b46640348 100644 --- a/src/net/searchstorehandler.h +++ b/src/net/searchstorehandler.h @@ -21,8 +21,6 @@ #ifndef NET_SEARCHSTOREHANDLER_H #define NET_SEARCHSTOREHANDLER_H -#ifdef EATHENA_SUPPORT - #include "enums/net/storesearchtype.h" #include "localconsts.h" @@ -54,5 +52,4 @@ class SearchStoreHandler notfinal extern Net::SearchStoreHandler *searchStoreHandler; -#endif // EATHENA_SUPPORT #endif // NET_SEARCHSTOREHANDLER_H diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index 37be5e279..1e87f88f8 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -168,18 +168,14 @@ class ServerInfo final #ifdef TMWA_SUPPORT if (compareStrI(serverType, "tmwathena") == 0) return ServerType::TMWATHENA; -#endif // TMWA_SUPPORT -#if defined(TMWA_SUPPORT) && defined(EATHENA_SUPPORT) else -#endif // defined(TMWA_SUPPORT) && defined(EATHENA_SUPPORT) -#ifdef EATHENA_SUPPORT +#endif // TMWA_SUPPORT if (compareStrI(serverType, "eathena") == 0) return ServerType::EATHENA; else if (compareStrI(serverType, "hercules") == 0) return ServerType::EATHENA; else if (compareStrI(serverType, "evol2") == 0) return ServerType::EVOL2; -#endif // EATHENA_SUPPORT return ServerType::UNKNOWN; } }; diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h index bc86c76ac..254ceaa2b 100644 --- a/src/net/tmwa/auctionhandler.h +++ b/src/net/tmwa/auctionhandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_AUCTIONHANDLER_H #define NET_TMWA_AUCTIONHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/auctionhandler.h" namespace TmwAthena @@ -62,5 +60,4 @@ class AuctionHandler final : public Net::AuctionHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_AUCTIONHANDLER_H diff --git a/src/net/tmwa/bankhandler.h b/src/net/tmwa/bankhandler.h index c71371dbe..b5c0edf29 100644 --- a/src/net/tmwa/bankhandler.h +++ b/src/net/tmwa/bankhandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_BANKHANDLER_H #define NET_TMWA_BANKHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/bankhandler.h" namespace TmwAthena @@ -48,5 +46,4 @@ class BankHandler final : public Net::BankHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_BANKHANDLER_H diff --git a/src/net/tmwa/battlegroundhandler.h b/src/net/tmwa/battlegroundhandler.h index 234b310a9..a56909c7d 100644 --- a/src/net/tmwa/battlegroundhandler.h +++ b/src/net/tmwa/battlegroundhandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_BATTLEGROUNDHANDLER_H #define NET_TMWA_BATTLEGROUNDHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/battlegroundhandler.h" namespace TmwAthena @@ -51,5 +49,4 @@ class BattleGroundHandler final : public Net::BattleGroundHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_BATTLEGROUNDHANDLER_H diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 3629cf8a7..b89cb22c9 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -56,7 +56,6 @@ void BeingHandler::undress(Being *const being) const being->unSetSprite(SPRITE_SHOES); } -#ifdef EATHENA_SUPPORT void BeingHandler::requestRanks(const RankT rank A_UNUSED) const { } @@ -64,7 +63,6 @@ void BeingHandler::requestRanks(const RankT rank A_UNUSED) const void BeingHandler::viewPlayerEquipment(const Being *const being A_UNUSED) const { } -#endif void BeingHandler::requestNameByCharId(const int id A_UNUSED) const { diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 4f3e70fb1..4c6df6f7b 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -39,13 +39,11 @@ class BeingHandler final : public Ea::BeingHandler void undress(Being *const being) const override final; -#ifdef EATHENA_SUPPORT void requestRanks(const RankT rank A_UNUSED) const override final A_CONST; void viewPlayerEquipment(const Being *const being) const override final A_CONST; -#endif void requestNameByCharId(const int id) const override final A_CONST; }; diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h index b9816310a..4658d9e79 100644 --- a/src/net/tmwa/buyingstorehandler.h +++ b/src/net/tmwa/buyingstorehandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_BUYINGSTOREHANDLER_H #define NET_TMWA_BUYINGSTOREHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/buyingstorehandler.h" namespace TmwAthena @@ -53,5 +51,4 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_BUYINGSTOREHANDLER_H diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h index 6c622270d..2fabdfc02 100644 --- a/src/net/tmwa/cashshophandler.h +++ b/src/net/tmwa/cashshophandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_CASHSHOPHANDLER_H #define NET_TMWA_CASHSHOPHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/cashshophandler.h" namespace TmwAthena @@ -54,5 +52,4 @@ class CashShopHandler final : public Net::CashShopHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_CASHSHOPHANDLER_H diff --git a/src/net/tmwa/elementalhandler.h b/src/net/tmwa/elementalhandler.h index b2ed06640..9eac1f937 100644 --- a/src/net/tmwa/elementalhandler.h +++ b/src/net/tmwa/elementalhandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_ELEMENTALHANDLER_H #define NET_TMWA_ELEMENTALHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/elementalhandler.h" namespace TmwAthena @@ -36,5 +34,4 @@ namespace TmwAthena }; } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_ELEMENTALHANDLER_H diff --git a/src/net/tmwa/familyhandler.h b/src/net/tmwa/familyhandler.h index c01df9e4f..53d7f8073 100644 --- a/src/net/tmwa/familyhandler.h +++ b/src/net/tmwa/familyhandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_FAMILYHANDLER_H #define NET_TMWA_FAMILYHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/familyhandler.h" namespace TmwAthena @@ -43,5 +41,4 @@ class FamilyHandler final : public Net::FamilyHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_FAMILYHANDLER_H diff --git a/src/net/tmwa/friendshandler.h b/src/net/tmwa/friendshandler.h index 6eb739d4d..94d1aa2c0 100644 --- a/src/net/tmwa/friendshandler.h +++ b/src/net/tmwa/friendshandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_FRIENDSHANDLER_H #define NET_TMWA_FRIENDSHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/friendshandler.h" namespace TmwAthena @@ -46,5 +44,4 @@ class FriendsHandler final : public Net::FriendsHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_FRIENDSHANDLER_H diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 831e2bd7e..71030d748 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -51,7 +51,6 @@ #include "net/tmwa/skillhandler.h" #include "net/tmwa/questhandler.h" -#ifdef EATHENA_SUPPORT #include "net/tmwa/auctionhandler.h" #include "net/tmwa/bankhandler.h" #include "net/tmwa/battlegroundhandler.h" @@ -68,7 +67,6 @@ #include "net/tmwa/roulettehandler.h" #include "net/tmwa/searchstorehandler.h" #include "net/tmwa/vendinghandler.h" -#endif #include "utils/delete2.h" #include "utils/gettext.h" @@ -98,7 +96,6 @@ GeneralHandler::GeneralHandler() : mSkillHandler(new SkillHandler), mTradeHandler(new TradeHandler), mQuestHandler(new QuestHandler), -#ifdef EATHENA_SUPPORT mServerFeatures(new ServerFeatures), mAuctionHandler(new AuctionHandler), mBankHandler(new BankHandler), @@ -116,9 +113,6 @@ GeneralHandler::GeneralHandler() : mRouletteHandler(new RouletteHandler), mSearchStoreHandler(new SearchStoreHandler), mVendingHandler(new VendingHandler) -#else - mServerFeatures(new ServerFeatures) -#endif { generalHandler = this; } diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 18273d093..02df75861 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -45,7 +45,6 @@ class SkillHandler; class TradeHandler; class QuestHandler; class ServerFeatures; -#ifdef EATHENA_SUPPORT class AuctionHandler; class BankHandler; class BattleGroundHandler; @@ -62,7 +61,6 @@ class MercenaryHandler; class RouletteHandler; class SearchStoreHandler; class VendingHandler; -#endif class GeneralHandler final : public Net::GeneralHandler { @@ -110,7 +108,6 @@ class GeneralHandler final : public Net::GeneralHandler TradeHandler *mTradeHandler; QuestHandler *mQuestHandler; ServerFeatures *mServerFeatures; -#ifdef EATHENA_SUPPORT AuctionHandler *mAuctionHandler; BankHandler *mBankHandler; BattleGroundHandler *mBattleGroundHandler; @@ -127,7 +124,6 @@ class GeneralHandler final : public Net::GeneralHandler RouletteHandler *mRouletteHandler; SearchStoreHandler *mSearchStoreHandler; VendingHandler *mVendingHandler; -#endif }; } // namespace TmwAthena diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h index 04999440a..557459627 100644 --- a/src/net/tmwa/homunculushandler.h +++ b/src/net/tmwa/homunculushandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_HOMUNCULUSHANDLER_H #define NET_TMWA_HOMUNCULUSHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/homunculushandler.h" namespace TmwAthena @@ -59,5 +57,4 @@ class HomunculusHandler final : public Net::HomunculusHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_HOMUNCULUSHANDLER_H diff --git a/src/net/tmwa/mailhandler.h b/src/net/tmwa/mailhandler.h index 9b12f0731..cf84e6cda 100644 --- a/src/net/tmwa/mailhandler.h +++ b/src/net/tmwa/mailhandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_MAILHANDLER_H #define NET_TMWA_MAILHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/mailhandler.h" namespace TmwAthena @@ -59,5 +57,4 @@ class MailHandler final : public Net::MailHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_MAILHANDLER_H diff --git a/src/net/tmwa/maphandler.h b/src/net/tmwa/maphandler.h index db2c9bb37..726445189 100644 --- a/src/net/tmwa/maphandler.h +++ b/src/net/tmwa/maphandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_MAPHANDLER_H #define NET_TMWA_MAPHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/maphandler.h" namespace TmwAthena @@ -38,5 +36,4 @@ class MapHandler final : public Net::MapHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_MAPHANDLER_H diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h index a9dac7519..68882ac57 100644 --- a/src/net/tmwa/markethandler.h +++ b/src/net/tmwa/markethandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_MARKETHANDLER_H #define NET_TMWA_MARKETHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/markethandler.h" namespace TmwAthena @@ -47,5 +45,4 @@ class MarketHandler final : public Net::MarketHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_MARKETHANDLER_H diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h index 760bdf8ac..ee7896eb5 100644 --- a/src/net/tmwa/mercenaryhandler.h +++ b/src/net/tmwa/mercenaryhandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_MERCENARYHANDLER_H #define NET_TMWA_MERCENARYHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/mercenaryhandler.h" namespace TmwAthena @@ -55,5 +53,4 @@ class MercenaryHandler final : public Net::MercenaryHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_MERCENARYHANDLER_H diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index ba1c8f7a3..4a02b32b4 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -161,12 +161,10 @@ void NpcHandler::produceMix(const int nameId A_UNUSED, { } -#ifdef EATHENA_SUPPORT void NpcHandler::cooking(const CookingTypeT type A_UNUSED, const int nameId A_UNUSED) const { } -#endif void NpcHandler::repair(const int index A_UNUSED) const { diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index b6483772d..f6ebff763 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -79,10 +79,8 @@ class NpcHandler final : public Ea::NpcHandler const int materialId2, const int materialId3) const override final A_CONST; -#ifdef EATHENA_SUPPORT void cooking(const CookingTypeT type, const int nameId) const override final A_CONST; -#endif void repair(const int index) const override final A_CONST; diff --git a/src/net/tmwa/roulettehandler.h b/src/net/tmwa/roulettehandler.h index ae68a4208..592cce98c 100644 --- a/src/net/tmwa/roulettehandler.h +++ b/src/net/tmwa/roulettehandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_ROULETTEHANDLER_H #define NET_TMWA_ROULETTEHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/roulettehandler.h" namespace TmwAthena @@ -37,5 +35,4 @@ class RouletteHandler final : public Net::RouletteHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_ROULETTEHANDLER_H diff --git a/src/net/tmwa/searchstorehandler.h b/src/net/tmwa/searchstorehandler.h index a116d266d..3051c98a1 100644 --- a/src/net/tmwa/searchstorehandler.h +++ b/src/net/tmwa/searchstorehandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_SEARCHSTOREHANDLER_H #define NET_TMWA_SEARCHSTOREHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/searchstorehandler.h" namespace TmwAthena @@ -50,5 +48,4 @@ class SearchStoreHandler final : public Net::SearchStoreHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_SEARCHSTOREHANDLER_H diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h index b06b15263..47a99c7b4 100644 --- a/src/net/tmwa/vendinghandler.h +++ b/src/net/tmwa/vendinghandler.h @@ -21,8 +21,6 @@ #ifndef NET_TMWA_VENDINGHANDLER_H #define NET_TMWA_VENDINGHANDLER_H -#ifdef EATHENA_SUPPORT - #include "net/vendinghandler.h" namespace TmwAthena @@ -56,5 +54,4 @@ class VendingHandler final : public Net::VendingHandler } // namespace TmwAthena -#endif // EATHENA_SUPPORT #endif // NET_TMWA_VENDINGHANDLER_H diff --git a/src/net/vendinghandler.h b/src/net/vendinghandler.h index e313d2ac8..dbabbef7a 100644 --- a/src/net/vendinghandler.h +++ b/src/net/vendinghandler.h @@ -21,8 +21,6 @@ #ifndef NET_VENDINGHANDLER_H #define NET_VENDINGHANDLER_H -#ifdef EATHENA_SUPPORT - #include <string> #include <vector> @@ -62,5 +60,4 @@ class VendingHandler notfinal extern Net::VendingHandler *vendingHandler; -#endif // EATHENA_SUPPORT #endif // NET_VENDINGHANDLER_H diff --git a/src/resources/inventory/inventory.cpp b/src/resources/inventory/inventory.cpp index d732874be..e0a6d833e 100644 --- a/src/resources/inventory/inventory.cpp +++ b/src/resources/inventory/inventory.cpp @@ -320,9 +320,7 @@ std::string Inventory::getName() const switch (mType) { case InventoryType::Inventory: -#ifdef EATHENA_SUPPORT case InventoryType::Vending: -#endif case InventoryType::TypeEnd: default: { @@ -339,7 +337,6 @@ std::string Inventory::getName() const // TRANSLATORS: inventory type name return N_("Npc"); } -#ifdef EATHENA_SUPPORT case InventoryType::Cart: { // TRANSLATORS: inventory type name @@ -355,7 +352,6 @@ std::string Inventory::getName() const // TRANSLATORS: inventory type name return N_("Craft"); } -#endif case InventoryType::Trade: { // TRANSLATORS: inventory type name |