diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-01 18:38:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-01 19:28:09 +0300 |
| commit | 624ddd306ebbd1cfdfd5bf85832ee969e15a619c (patch) | |
| tree | d36e74e62836de01727fc0a440f3a70cabc91acd /src/net/ea | |
| parent | 1d6c226f2aae2410f9785709aefd88f1a17e6bca (diff) | |
| download | plus-624ddd306ebbd1cfdfd5bf85832ee969e15a619c.tar.gz plus-624ddd306ebbd1cfdfd5bf85832ee969e15a619c.tar.bz2 plus-624ddd306ebbd1cfdfd5bf85832ee969e15a619c.tar.xz plus-624ddd306ebbd1cfdfd5bf85832ee969e15a619c.zip | |
Move JOB stat from net enum into attributes.
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/eaprotocol.h | 5 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 15 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.h | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h index a34681309..589e7bdcd 100644 --- a/src/net/ea/eaprotocol.h +++ b/src/net/ea/eaprotocol.h @@ -25,11 +25,6 @@ enum { - EA_JOB = 0xa -}; - -enum -{ EA_SPRITE_BASE = 0, EA_SPRITE_SHOE, EA_SPRITE_BOTTOMCLOTHES, diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 4bdc2bc8b..8a2b2bf30 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -279,11 +279,6 @@ bool PlayerHandler::canUseMagic() const return PlayerInfo::getStatEffective(Attributes::MATK) > 0; } -int PlayerHandler::getJobLocation() const -{ - return EA_JOB; -} - #define setStatComplex(stat) \ PlayerInfo::setStatBase(stat, base, notify); \ if (mod != -1) \ @@ -306,8 +301,8 @@ void PlayerHandler::setStat(const int type, PlayerInfo::setAttribute(Attributes::EXP, base); break; case 0x0002: - PlayerInfo::setStatExperience(EA_JOB, base, - PlayerInfo::getStatExperience(EA_JOB).second); + PlayerInfo::setStatExperience(Attributes::JOB, base, + PlayerInfo::getStatExperience(Attributes::JOB).second); break; case 0x0003: PlayerInfo::setStatBase(Attributes::KARMA, base); @@ -406,8 +401,8 @@ void PlayerHandler::setStat(const int type, PlayerInfo::setAttribute(Attributes::EXP_NEEDED, base); break; case 0x0017: - PlayerInfo::setStatExperience(EA_JOB, - PlayerInfo::getStatExperience(EA_JOB).first, base); + PlayerInfo::setStatExperience(Attributes::JOB, + PlayerInfo::getStatExperience(Attributes::JOB).first, base); break; case 0x0018: if (!weightNotice && config.getBoolValue("weightMsg")) @@ -517,7 +512,7 @@ void PlayerHandler::setStat(const int type, PlayerInfo::updateAttrs(); break; case 0x0037: - PlayerInfo::setStatBase(EA_JOB, base); + PlayerInfo::setStatBase(Attributes::JOB, base); break; default: diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index cfde84a6e..8c530b29d 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -53,8 +53,6 @@ class PlayerHandler notfinal : public Net::PlayerHandler Vector getDefaultWalkSpeed() const override final A_WARN_UNUSED; - int getJobLocation() const override final A_WARN_UNUSED; - protected: virtual void setStat(const int type, const int base, |