diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-01 15:28:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-01 19:28:08 +0300 |
| commit | 081e86a783d33e92d9566f5262b629031887d404 (patch) | |
| tree | f5a5004837089887fc3a8d99093e8beae9236727 /src/net/eathena | |
| parent | a001d8490f6996d5228d0e86ef3b3c6ee1712c47 (diff) | |
| download | manaplus-081e86a783d33e92d9566f5262b629031887d404.tar.gz manaplus-081e86a783d33e92d9566f5262b629031887d404.tar.bz2 manaplus-081e86a783d33e92d9566f5262b629031887d404.tar.xz manaplus-081e86a783d33e92d9566f5262b629031887d404.zip | |
Move CRIT stat from net enum into attributes.
Diffstat (limited to 'src/net/eathena')
| -rw-r--r-- | src/net/eathena/attrs.h | 6 | ||||
| -rw-r--r-- | src/net/eathena/generalhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/playerhandler.cpp | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h index d79e0de27..424e6ea96 100644 --- a/src/net/eathena/attrs.h +++ b/src/net/eathena/attrs.h @@ -41,11 +41,7 @@ namespace EAthena MATK, MDEF, HIT, - FLEE, - CRIT - -// KARMA, -// MANNER + FLEE }; } // namespace EAthena diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 63fbb707e..5669d452e 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -362,7 +362,7 @@ void GeneralHandler::gameStarted() const // xgettext:no-c-format statusWindow->addAttribute(FLEE, _("% Evade")); // xgettext:no-c-format - statusWindow->addAttribute(CRIT, _("% Critical")); + statusWindow->addAttribute(Attributes::CRIT, _("% Critical")); statusWindow->addAttribute(Attributes::ATTACK_DELAY, _("Attack Delay")); statusWindow->addAttribute(Attributes::WALK_SPEED, _("Walk Delay")); statusWindow->addAttribute(Attributes::ATTACK_RANGE, _("Attack Range")); diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 089a06d26..2617b70f6 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -353,7 +353,7 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg) PlayerInfo::setStatBase(FLEE, msg.readInt16("flee"), false); PlayerInfo::setStatMod(FLEE, msg.readInt16("flee2/10")); - PlayerInfo::setStatBase(CRIT, msg.readInt16("crit/10")); + PlayerInfo::setStatBase(Attributes::CRIT, msg.readInt16("crit/10")); PlayerInfo::setAttribute(Attributes::ATTACK_DELAY, msg.readInt16("attack speed")); |