summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-01 00:43:10 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-01 00:43:10 +0300
commit9e755afa031f39172292aa82d3df42c1eaa01b03 (patch)
tree396cf53255eba81d80cfe9a0f6c04022c72e19a6
parent50f96cb7f1069aee951a4ffabd17d2e9753b0987 (diff)
downloadplus-9e755afa031f39172292aa82d3df42c1eaa01b03.tar.gz
plus-9e755afa031f39172292aa82d3df42c1eaa01b03.tar.bz2
plus-9e755afa031f39172292aa82d3df42c1eaa01b03.tar.xz
plus-9e755afa031f39172292aa82d3df42c1eaa01b03.zip
Fix magic skill level checks.
-rw-r--r--src/actorspritemanager.cpp4
-rw-r--r--src/localplayer.cpp4
-rw-r--r--src/spellmanager.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index ce54316fd..f87f84a50 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -1144,8 +1144,8 @@ void ActorSpriteManager::heal(const Being *const target) const
}
}
// magic levels < 2
- else if (PlayerInfo::getStatEffective(340) < 2
- || PlayerInfo::getStatEffective(341) < 2)
+ else if (PlayerInfo::getSkillLevel(340) < 2
+ || PlayerInfo::getSkillLevel(341) < 2)
{
if (PlayerInfo::getAttribute(PlayerInfo::MP) >= 6)
{
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 3b824730b..031844ffd 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -3211,8 +3211,8 @@ void LocalPlayer::tryMagic(const std::string &spell, const int baseMagic,
if (!chatWindow)
return;
- if (PlayerInfo::getStatEffective(340) >= baseMagic
- && PlayerInfo::getStatEffective(342) >= schoolMagic)
+ if (PlayerInfo::getSkillLevel(340) >= baseMagic
+ && PlayerInfo::getSkillLevel(342) >= schoolMagic)
{
if (PlayerInfo::getAttribute(PlayerInfo::MP) >= mana)
{
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 77248c68b..9c50ca65f 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -135,9 +135,9 @@ void SpellManager::invoke(const int spellId)
if (spell->getCommandType() == TEXT_COMMAND_TEXT
|| (Net::getPlayerHandler()->canUseMagic()
- && PlayerInfo::getStatEffective(SKILL_MAGIC)
+ && PlayerInfo::getSkillLevel(SKILL_MAGIC)
>= static_cast<signed>(spell->getBaseLvl())
- && PlayerInfo::getStatEffective(
+ && PlayerInfo::getSkillLevel(
spell->getSchool()) >= static_cast<signed>(spell->getSchoolLvl())
&& PlayerInfo::getAttribute(PlayerInfo::MP) >= spell->getMana()))
{