summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-01 18:38:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-01 19:28:09 +0300
commit624ddd306ebbd1cfdfd5bf85832ee969e15a619c (patch)
treed36e74e62836de01727fc0a440f3a70cabc91acd /src/net
parent1d6c226f2aae2410f9785709aefd88f1a17e6bca (diff)
downloadmv-624ddd306ebbd1cfdfd5bf85832ee969e15a619c.tar.gz
mv-624ddd306ebbd1cfdfd5bf85832ee969e15a619c.tar.bz2
mv-624ddd306ebbd1cfdfd5bf85832ee969e15a619c.tar.xz
mv-624ddd306ebbd1cfdfd5bf85832ee969e15a619c.zip
Move JOB stat from net enum into attributes.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/eaprotocol.h5
-rw-r--r--src/net/ea/playerhandler.cpp15
-rw-r--r--src/net/ea/playerhandler.h2
-rw-r--r--src/net/eathena/attrs.h4
-rw-r--r--src/net/eathena/charserverhandler.cpp2
-rw-r--r--src/net/playerhandler.h2
-rw-r--r--src/net/tmwa/attrs.h4
-rw-r--r--src/net/tmwa/charserverhandler.cpp2
8 files changed, 7 insertions, 29 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,
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h
index a8db3fec5..0c3edfada 100644
--- a/src/net/eathena/attrs.h
+++ b/src/net/eathena/attrs.h
@@ -25,10 +25,6 @@
namespace EAthena
{
- enum
- {
- JOB = 0xa
- };
} // namespace EAthena
#endif // NET_EATHENA_ATTRS_H
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 6a0bd6509..9dbdb7cad 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -148,7 +148,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
PlayerInfoBackend &data = character->data;
data.mAttributes[Attributes::EXP] = msg.readInt32("exp");
data.mAttributes[Attributes::MONEY] = msg.readInt32("money");
- Stat &jobStat = data.mStats[JOB];
+ Stat &jobStat = data.mStats[Attributes::JOB];
jobStat.exp = msg.readInt32("job");
const int temp = msg.readInt32("job level");
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 347f92e67..c5b87e2ae 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -69,8 +69,6 @@ class PlayerHandler notfinal
virtual bool canCorrectAttributes() const = 0;
- virtual int getJobLocation() const A_WARN_UNUSED = 0;
-
virtual Vector getDefaultWalkSpeed() const A_WARN_UNUSED = 0;
virtual void requestOnlineList() const = 0;
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 060e44c71..869dba3ed 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -25,10 +25,6 @@
namespace TmwAthena
{
- enum
- {
- JOB = 0xa
- };
} // namespace TmwAthena
#endif // NET_TMWA_ATTRS_H
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index b1d1fa055..7d5f7a299 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -146,7 +146,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
PlayerInfoBackend &data = character->data;
data.mAttributes[Attributes::EXP] = msg.readInt32("exp");
data.mAttributes[Attributes::MONEY] = msg.readInt32("money");
- Stat &jobStat = data.mStats[static_cast<size_t>(JOB)];
+ Stat &jobStat = data.mStats[static_cast<size_t>(Attributes::JOB)];
jobStat.exp = msg.readInt32("job");
const int temp = msg.readInt32("job level");