summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-01 17:00:39 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-01 19:28:09 +0300
commite6eef288f86dcc16aa2b5ba20c9079ead78f17e2 (patch)
treea878c5d7efab2c382bfa53860af305c8148b2c88 /src/net/ea
parente6853de603d64bd6e194e308e5e532339545e892 (diff)
downloadmanaplus-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.tar.gz
manaplus-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.tar.bz2
manaplus-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.tar.xz
manaplus-e6eef288f86dcc16aa2b5ba20c9079ead78f17e2.zip
Move ATK stat from net enum into attributes.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/eaprotocol.h4
-rw-r--r--src/net/ea/playerhandler.cpp11
-rw-r--r--src/net/ea/playerhandler.h2
3 files changed, 3 insertions, 14 deletions
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index b1df70a20..98ed935f9 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -32,9 +32,7 @@ enum
EA_VIT,
EA_INT,
EA_DEX,
- EA_LUK,
-
- EA_ATK
+ EA_LUK
};
enum
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index c12da7bfc..cc2de72c7 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -222,8 +222,6 @@ void PlayerHandler::processPlayerStatUpdate3(Net::MessageIn &msg) const
const int bonus = msg.readInt32("bonus");
setStat(type, base, bonus, false);
- if (type == EA_ATK || type == Attributes::ATTACK_DELAY)
- PlayerInfo::updateAttrs();
BLOCK_END("PlayerHandler::processPlayerStatUpdate3")
}
@@ -286,11 +284,6 @@ int PlayerHandler::getJobLocation() const
return EA_JOB;
}
-int PlayerHandler::getAttackLocation() const
-{
- return EA_ATK;
-}
-
#define setStatComplex(stat) \
PlayerInfo::setStatBase(stat, base, notify); \
if (mod != -1) \
@@ -480,11 +473,11 @@ void PlayerHandler::setStat(const int type,
statusWindow->setPointsNeeded(EA_LUK, base);
break;
case 0x0029:
- PlayerInfo::setStatBase(EA_ATK, base);
+ PlayerInfo::setStatBase(Attributes::ATK, base);
PlayerInfo::updateAttrs();
break;
case 0x002a:
- PlayerInfo::setStatMod(EA_ATK, base);
+ PlayerInfo::setStatMod(Attributes::ATK, base);
PlayerInfo::updateAttrs();
break;
case 0x002b:
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index a2e126bc2..cfde84a6e 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -55,8 +55,6 @@ class PlayerHandler notfinal : public Net::PlayerHandler
int getJobLocation() const override final A_WARN_UNUSED;
- int getAttackLocation() const override final A_WARN_UNUSED;
-
protected:
virtual void setStat(const int type,
const int base,