summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-01 16:32:05 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-01 19:28:09 +0300
commite6853de603d64bd6e194e308e5e532339545e892 (patch)
tree8839596e6f54ee6a93a045377d3101f7ef9e66b4
parent52c0fc91e3b59b0f9a2cac98cb4cd1eb5847884c (diff)
downloadManaVerse-e6853de603d64bd6e194e308e5e532339545e892.tar.gz
ManaVerse-e6853de603d64bd6e194e308e5e532339545e892.tar.bz2
ManaVerse-e6853de603d64bd6e194e308e5e532339545e892.tar.xz
ManaVerse-e6853de603d64bd6e194e308e5e532339545e892.zip
Move DEF stat from net enum into attributes.
-rw-r--r--src/being/attributes.h3
-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.cpp4
-rw-r--r--src/net/tmwa/attrs.h3
-rw-r--r--src/net/tmwa/generalhandler.cpp2
-rw-r--r--src/net/tmwa/playerhandler.cpp4
9 files changed, 13 insertions, 15 deletions
diff --git a/src/being/attributes.h b/src/being/attributes.h
index cd753c2fa..e7d6498b8 100644
--- a/src/being/attributes.h
+++ b/src/being/attributes.h
@@ -52,7 +52,8 @@ namespace Attributes
FLEE,
HIT,
MDEF,
- MATK
+ MATK,
+ DEF
};
} // namespace Attributes
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index f355b16a9..b1df70a20 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -34,8 +34,7 @@ enum
EA_DEX,
EA_LUK,
- EA_ATK,
- EA_DEF
+ EA_ATK
};
enum
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 4c9f5be61..c12da7bfc 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -494,10 +494,10 @@ void PlayerHandler::setStat(const int type,
PlayerInfo::setStatMod(Attributes::MATK, base);
break;
case 0x002d:
- PlayerInfo::setStatBase(EA_DEF, base);
+ PlayerInfo::setStatBase(Attributes::DEF, base);
break;
case 0x002e:
- PlayerInfo::setStatMod(EA_DEF, base);
+ PlayerInfo::setStatMod(Attributes::DEF, base);
break;
case 0x002f:
PlayerInfo::setStatBase(Attributes::MDEF, base);
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h
index c40b48092..db866c0bc 100644
--- a/src/net/eathena/attrs.h
+++ b/src/net/eathena/attrs.h
@@ -36,8 +36,7 @@ namespace EAthena
DEX,
LUK,
- ATK,
- DEF
+ ATK
};
} // namespace EAthena
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index a07040f18..83b55e3bd 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -354,7 +354,7 @@ void GeneralHandler::gameStarted() const
statusWindow->addAttribute(LUK, _("Luck"), "luk", true);
statusWindow->addAttribute(ATK, _("Attack"));
- statusWindow->addAttribute(DEF, _("Defense"));
+ statusWindow->addAttribute(Attributes::DEF, _("Defense"));
statusWindow->addAttribute(Attributes::MATK, _("M.Attack"));
statusWindow->addAttribute(Attributes::MDEF, _("M.Defense"));
// xgettext:no-c-format
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index b3b7df25b..c1412819b 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -342,8 +342,8 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
val = msg.readInt16("left matk");
PlayerInfo::setStatMod(Attributes::MATK, val);
- PlayerInfo::setStatBase(DEF, msg.readInt16("left def"), false);
- PlayerInfo::setStatMod(DEF, msg.readInt16("right def"));
+ PlayerInfo::setStatBase(Attributes::DEF, msg.readInt16("left def"), false);
+ PlayerInfo::setStatMod(Attributes::DEF, msg.readInt16("right def"));
PlayerInfo::setStatBase(Attributes::MDEF,
msg.readInt16("left mdef"), false);
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 03c38d804..bd5a0cae4 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -36,8 +36,7 @@ namespace TmwAthena
DEX,
LUK,
- ATK,
- DEF
+ ATK
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 0fdb7017c..ecc320219 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -320,7 +320,7 @@ void GeneralHandler::gameStarted() const
// TRANSLATORS: player stat
statusWindow->addAttribute(ATK, _("Attack"));
// TRANSLATORS: player stat
- statusWindow->addAttribute(DEF, _("Defense"));
+ statusWindow->addAttribute(Attributes::DEF, _("Defense"));
// TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::MATK, _("M.Attack"));
// TRANSLATORS: player stat
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 247a0f6d9..504484217 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -410,8 +410,8 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
val = msg.readInt16("matk+");
PlayerInfo::setStatMod(Attributes::MATK, val);
- PlayerInfo::setStatBase(DEF, msg.readInt16("def"), false);
- PlayerInfo::setStatMod(DEF, msg.readInt16("def+"));
+ PlayerInfo::setStatBase(Attributes::DEF, msg.readInt16("def"), false);
+ PlayerInfo::setStatMod(Attributes::DEF, msg.readInt16("def+"));
PlayerInfo::setStatBase(Attributes::MDEF, msg.readInt16("mdef"), false);
PlayerInfo::setStatMod(Attributes::MDEF, msg.readInt16("mdef+"));