From 91e4a003fdcaa21e7d375d3eaf92ea9f6166b841 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 7 Mar 2016 22:05:12 +0300 Subject: Disable all legacy "magic" commands if server type not tmwa. --- src/actormanager.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'src/actormanager.cpp') diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 471d8d72e..5feb04a59 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -48,6 +48,7 @@ #include "net/beinghandler.h" #include "net/charserverhandler.h" +#include "net/net.h" #include "net/packetlimiter.h" #include "net/playerhandler.h" #include "net/serverfeatures.h" @@ -1328,8 +1329,15 @@ void ActorManager::healTarget() const void ActorManager::heal(const Being *const target) const { - if (!localPlayer || !chatWindow || !localPlayer->isAlive() - || !playerHandler->canUseMagic()) +#ifdef EATHENA_SUPPORT + if (Net::getNetworkType() != ServerType::TMWATHENA) + return; +#endif + + if (!localPlayer || + !chatWindow || + !localPlayer->isAlive() || + !playerHandler->canUseMagic()) { return; } @@ -1447,8 +1455,14 @@ Being* ActorManager::findMostDamagedPlayer(const int maxTileDist) const void ActorManager::itenplz() const { - if (!localPlayer || !chatWindow || !localPlayer->isAlive() - || !playerHandler->canUseMagic()) +#ifdef EATHENA_SUPPORT + if (Net::getNetworkType() != ServerType::TMWATHENA) + return; +#endif + if (!localPlayer || + !chatWindow || + !localPlayer->isAlive() || + !playerHandler->canUseMagic()) { return; } -- cgit v1.2.3-60-g2f50