diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:50:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:50:28 +0300 |
| commit | 616ab2676cc932ab59152c510d584c429090987a (patch) | |
| tree | 9184b8836b51a073f67ee60a46043084687207a7 /src/being | |
| parent | 4b397f4c8e2b0c8d636cc2782d9571567473975b (diff) | |
| download | manaplus-616ab2676cc932ab59152c510d584c429090987a.tar.gz manaplus-616ab2676cc932ab59152c510d584c429090987a.tar.bz2 manaplus-616ab2676cc932ab59152c510d584c429090987a.tar.xz manaplus-616ab2676cc932ab59152c510d584c429090987a.zip | |
Remove getter for serverFeatures.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 2 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index e0aa5f29c..c5e2ff716 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2456,7 +2456,7 @@ void Being::drawHpBar(Graphics *const graphics, const int maxHP, const int hp, const int dx = static_cast<const int>(static_cast<float>(width) / p); - if (!Net::getServerFeatures()->haveServerHp()) + if (!serverFeatures->haveServerHp()) { // old servers if ((!damage && (this != localPlayer || hp == maxHP)) || (!hp && maxHP == damage)) diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 23a8063ca..30e323d7e 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -334,7 +334,7 @@ void LocalPlayer::slowLogic() weightNoticeTime = 0; } - if (!Net::getServerFeatures()->havePlayerStatusUpdate() + if (!serverFeatures->havePlayerStatusUpdate() && mEnableAdvert && !mBlockAdvert && mAdvertTime < cur_time) @@ -858,7 +858,7 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, const int amount, else { std::string str; - if (Net::getServerFeatures()->haveItemColors()) + if (serverFeatures->haveItemColors()) str = itemInfo.getName(color); else str = itemInfo.getName(); @@ -1117,7 +1117,7 @@ void LocalPlayer::moveToTarget(int dist) dist = settings.moveToTargetType; if (dist != 0) { - const bool broken = Net::getServerFeatures() + const bool broken = serverFeatures ->haveBrokenPlayerAttackDistance(); switch (dist) { @@ -2745,7 +2745,7 @@ void LocalPlayer::attack2(Being *const target, const bool keep, if (!dontChangeEquipment && target) changeEquipmentBeforeAttack(target); - const bool broken = Net::getServerFeatures() + const bool broken = serverFeatures ->haveBrokenPlayerAttackDistance(); // probably need cache getPathLength(target) @@ -3226,7 +3226,7 @@ bool LocalPlayer::checAttackPermissions(const Being *const target) void LocalPlayer::updateStatus() const { - if (Net::getServerFeatures()->havePlayerStatusUpdate() && mEnableAdvert) + if (serverFeatures->havePlayerStatusUpdate() && mEnableAdvert) { uint8_t status = 0; if (mTradebot && shopWindow && !shopWindow->isShopEmpty()) |