summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-01 17:26:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-01 19:28:09 +0300
commit43713ab4bb834e898c0d2c3289555d22fe08132e (patch)
tree8ae0f663ad44cb5d754babff17d25e09e8b6a2bf /src/net
parent10b5b99e5e7e5f332c077a2d261df8f02f111c4f (diff)
downloadmanaplus-43713ab4bb834e898c0d2c3289555d22fe08132e.tar.gz
manaplus-43713ab4bb834e898c0d2c3289555d22fe08132e.tar.bz2
manaplus-43713ab4bb834e898c0d2c3289555d22fe08132e.tar.xz
manaplus-43713ab4bb834e898c0d2c3289555d22fe08132e.zip
Move VIT stat from net enum into attributes.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/eaprotocol.h3
-rw-r--r--src/net/ea/playerhandler.cpp4
-rw-r--r--src/net/eathena/attrs.h3
-rw-r--r--src/net/eathena/generalhandler.cpp2
-rw-r--r--src/net/eathena/playerhandler.cpp9
-rw-r--r--src/net/tmwa/attrs.h3
-rw-r--r--src/net/tmwa/generalhandler.cpp2
-rw-r--r--src/net/tmwa/playerhandler.cpp9
8 files changed, 21 insertions, 14 deletions
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index 176dcdebc..3b1b02fc2 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -28,8 +28,7 @@ enum
EA_JOB = 0xa,
EA_STR = 0xd,
- EA_AGI,
- EA_VIT
+ EA_AGI
};
enum
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index e45dbd1fe..afc459b38 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -373,7 +373,7 @@ void PlayerHandler::setStat(const int type,
setStatComplex(EA_AGI);
break;
case 0x000f:
- setStatComplex(EA_VIT);
+ setStatComplex(Attributes::VIT);
break;
case 0x0010:
setStatComplex(Attributes::INT);
@@ -461,7 +461,7 @@ void PlayerHandler::setStat(const int type,
statusWindow->setPointsNeeded(EA_AGI, base);
break;
case 0x0022:
- statusWindow->setPointsNeeded(EA_VIT, base);
+ statusWindow->setPointsNeeded(Attributes::VIT, base);
break;
case 0x0023:
statusWindow->setPointsNeeded(Attributes::INT, base);
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h
index b18834c5c..9053886a8 100644
--- a/src/net/eathena/attrs.h
+++ b/src/net/eathena/attrs.h
@@ -30,8 +30,7 @@ namespace EAthena
JOB = 0xa,
STR = 0xd,
- AGI,
- VIT
+ AGI
};
} // namespace EAthena
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index d807654c0..268cd0f7a 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -348,7 +348,7 @@ void GeneralHandler::gameStarted() const
statusWindow->addAttribute(STR, _("Strength"), "str", true);
statusWindow->addAttribute(AGI, _("Agility"), "agi", true);
- statusWindow->addAttribute(VIT, _("Vitality"), "vit", true);
+ statusWindow->addAttribute(Attributes::VIT, _("Vitality"), "vit", true);
statusWindow->addAttribute(Attributes::INT,
_("Intelligence"), "int", true);
statusWindow->addAttribute(Attributes::DEX, _("Dexterity"), "dex", true);
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 75996016b..ac035826d 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -305,11 +305,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
msg.readUInt8("agi cost");
val = msg.readUInt8("vit");
- PlayerInfo::setStatBase(VIT, val);
+ PlayerInfo::setStatBase(Attributes::VIT, val);
if (statusWindow)
- statusWindow->setPointsNeeded(VIT, msg.readUInt8("vit cost"));
+ {
+ statusWindow->setPointsNeeded(Attributes::VIT,
+ msg.readUInt8("vit cost"));
+ }
else
+ {
msg.readUInt8("vit cost");
+ }
val = msg.readUInt8("int");
PlayerInfo::setStatBase(Attributes::INT, val);
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 746b05607..75bf75e1b 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -30,8 +30,7 @@ namespace TmwAthena
JOB = 0xa,
STR = 0xd,
- AGI,
- VIT
+ AGI
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index f2ed990fe..a41d900c4 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -309,7 +309,7 @@ void GeneralHandler::gameStarted() const
// TRANSLATORS: player stat
statusWindow->addAttribute(AGI, _("Agility"), "agi", true);
// TRANSLATORS: player stat
- statusWindow->addAttribute(VIT, _("Vitality"), "vit", true);
+ statusWindow->addAttribute(Attributes::VIT, _("Vitality"), "vit", true);
// TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::INT,
_("Intelligence"), "int", true);
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 78d4876f2..6e7d4f9a6 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -373,11 +373,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
msg.readUInt8("agi cost");
val = msg.readUInt8("vit");
- PlayerInfo::setStatBase(VIT, val);
+ PlayerInfo::setStatBase(Attributes::VIT, val);
if (statusWindow)
- statusWindow->setPointsNeeded(VIT, msg.readUInt8("vit cost"));
+ {
+ statusWindow->setPointsNeeded(Attributes::VIT,
+ msg.readUInt8("vit cost"));
+ }
else
+ {
msg.readUInt8("vit cost");
+ }
val = msg.readUInt8("int");
PlayerInfo::setStatBase(Attributes::INT, val);