summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-01 17:21:42 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-01 19:28:09 +0300
commit10b5b99e5e7e5f332c077a2d261df8f02f111c4f (patch)
tree957b1fa2852d4a498fb7b7b57181fe40176c669d
parent97ceb0fc66be86d09b2bc42b7580d3976cbddd80 (diff)
downloadplus-10b5b99e5e7e5f332c077a2d261df8f02f111c4f.tar.gz
plus-10b5b99e5e7e5f332c077a2d261df8f02f111c4f.tar.bz2
plus-10b5b99e5e7e5f332c077a2d261df8f02f111c4f.tar.xz
plus-10b5b99e5e7e5f332c077a2d261df8f02f111c4f.zip
Move INT stat from net enum into attributes.
-rw-r--r--src/being/attributes.h1
-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.cpp3
-rw-r--r--src/net/eathena/playerhandler.cpp9
-rw-r--r--src/net/tmwa/attrs.h3
-rw-r--r--src/net/tmwa/generalhandler.cpp3
-rw-r--r--src/net/tmwa/playerhandler.cpp9
9 files changed, 24 insertions, 14 deletions
diff --git a/src/being/attributes.h b/src/being/attributes.h
index 43f3af382..8580d0f9d 100644
--- a/src/being/attributes.h
+++ b/src/being/attributes.h
@@ -42,6 +42,7 @@ namespace Attributes
SKILL_POINTS,
CHAR_POINTS,
CORR_POINTS,
+ INT = 16,
DEX = 17,
LUK = 18,
ATTACK_DELAY = 100,
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index fcd9cd3cf..176dcdebc 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -29,8 +29,7 @@ enum
EA_STR = 0xd,
EA_AGI,
- EA_VIT,
- EA_INT
+ EA_VIT
};
enum
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 5c631338c..e45dbd1fe 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -376,7 +376,7 @@ void PlayerHandler::setStat(const int type,
setStatComplex(EA_VIT);
break;
case 0x0010:
- setStatComplex(EA_INT);
+ setStatComplex(Attributes::INT);
break;
case 0x0011:
setStatComplex(Attributes::DEX);
@@ -464,7 +464,7 @@ void PlayerHandler::setStat(const int type,
statusWindow->setPointsNeeded(EA_VIT, base);
break;
case 0x0023:
- statusWindow->setPointsNeeded(EA_INT, base);
+ statusWindow->setPointsNeeded(Attributes::INT, base);
break;
case 0x0024:
statusWindow->setPointsNeeded(Attributes::DEX, base);
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h
index e536a1818..b18834c5c 100644
--- a/src/net/eathena/attrs.h
+++ b/src/net/eathena/attrs.h
@@ -31,8 +31,7 @@ namespace EAthena
STR = 0xd,
AGI,
- VIT,
- INT
+ VIT
};
} // namespace EAthena
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 53e0636d8..d807654c0 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -349,7 +349,8 @@ void GeneralHandler::gameStarted() const
statusWindow->addAttribute(STR, _("Strength"), "str", true);
statusWindow->addAttribute(AGI, _("Agility"), "agi", true);
statusWindow->addAttribute(VIT, _("Vitality"), "vit", true);
- statusWindow->addAttribute(INT, _("Intelligence"), "int", true);
+ statusWindow->addAttribute(Attributes::INT,
+ _("Intelligence"), "int", true);
statusWindow->addAttribute(Attributes::DEX, _("Dexterity"), "dex", true);
statusWindow->addAttribute(Attributes::LUK, _("Luck"), "luk", true);
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 1bdf1a39e..75996016b 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -312,11 +312,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
msg.readUInt8("vit cost");
val = msg.readUInt8("int");
- PlayerInfo::setStatBase(INT, val);
+ PlayerInfo::setStatBase(Attributes::INT, val);
if (statusWindow)
- statusWindow->setPointsNeeded(INT, msg.readUInt8("int cost"));
+ {
+ statusWindow->setPointsNeeded(Attributes::INT,
+ msg.readUInt8("int cost"));
+ }
else
+ {
msg.readUInt8("int cost");
+ }
val = msg.readUInt8("dex");
PlayerInfo::setStatBase(Attributes::DEX, val);
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index fe2068965..746b05607 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -31,8 +31,7 @@ namespace TmwAthena
STR = 0xd,
AGI,
- VIT,
- INT
+ VIT
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index c0e341b00..f2ed990fe 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -311,7 +311,8 @@ void GeneralHandler::gameStarted() const
// TRANSLATORS: player stat
statusWindow->addAttribute(VIT, _("Vitality"), "vit", true);
// TRANSLATORS: player stat
- statusWindow->addAttribute(INT, _("Intelligence"), "int", true);
+ statusWindow->addAttribute(Attributes::INT,
+ _("Intelligence"), "int", true);
// TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::DEX, _("Dexterity"), "dex", true);
// TRANSLATORS: player stat
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 5ef1439fe..78d4876f2 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -380,11 +380,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
msg.readUInt8("vit cost");
val = msg.readUInt8("int");
- PlayerInfo::setStatBase(INT, val);
+ PlayerInfo::setStatBase(Attributes::INT, val);
if (statusWindow)
- statusWindow->setPointsNeeded(INT, msg.readUInt8("int cost"));
+ {
+ statusWindow->setPointsNeeded(Attributes::INT,
+ msg.readUInt8("int cost"));
+ }
else
+ {
msg.readUInt8("int cost");
+ }
val = msg.readUInt8("dex");
PlayerInfo::setStatBase(Attributes::DEX, val);