diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-07 22:05:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-07 22:05:12 +0300 |
| commit | 91e4a003fdcaa21e7d375d3eaf92ea9f6166b841 (patch) | |
| tree | 5ab1312bbe541c417df19441d30fab399ac681d3 | |
| parent | 6c077bb84b2b33339100382494163034ec092a0c (diff) | |
| download | manaplus-91e4a003fdcaa21e7d375d3eaf92ea9f6166b841.tar.gz manaplus-91e4a003fdcaa21e7d375d3eaf92ea9f6166b841.tar.bz2 manaplus-91e4a003fdcaa21e7d375d3eaf92ea9f6166b841.tar.xz manaplus-91e4a003fdcaa21e7d375d3eaf92ea9f6166b841.zip | |
Disable all legacy "magic" commands if server type not tmwa.
| -rw-r--r-- | src/actormanager.cpp | 22 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 6 |
2 files changed, 24 insertions, 4 deletions
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; } diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index a14bd3383..9cf739d74 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -84,6 +84,8 @@ #include "resources/sprite/animatedsprite.h" +#include "net/net.h" + #include "utils/delete2.h" #include "utils/gettext.h" #include "utils/timer.h" @@ -1612,6 +1614,10 @@ 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()) { |