Move CRIT stat from net enum into attributes.

9 files changed, 10 insertions, 21 deletions

diff --git a/src/being/attributes.h b/src/being/attributes.h
index 42a061b7d..b961985e0 100644
--- a/src/being/attributes.h
+++ b/src/being/attributes.h
@@ -47,7 +47,8 @@ namespace Attributes
         WALK_SPEED = 102,
         ATTACK_SPEED = 103,
         KARMA,
-        MANNER
+        MANNER,
+        CRIT
     };
 }  // namespace Attributes
 
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index 226bb7401..5bb9ef46d 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -39,11 +39,7 @@ enum
     EA_MATK,
     EA_MDEF,
     EA_HIT,
-    EA_FLEE,
-    EA_CRIT
-
-//    KARMA,
-//    MANNER
+    EA_FLEE
 };
 
 enum
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 831bc08e0..cafd4b681 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -515,7 +515,7 @@ void PlayerHandler::setStat(const int type,
             PlayerInfo::setStatMod(EA_FLEE, base);
             break;
         case 0x0034:
-            PlayerInfo::setStatBase(EA_CRIT, base);
+            PlayerInfo::setStatBase(Attributes::CRIT, base);
             break;
         case 0x0035:
             localPlayer->setAttackSpeed(base);
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"));
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 98c135ee1..7989349af 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -41,11 +41,7 @@ namespace TmwAthena
         MATK,
         MDEF,
         HIT,
-        FLEE,
-        CRIT
-
-//        KARMA,
-//        MANNER
+        FLEE
     };
 }  // namespace TmwAthena
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index bde54c207..67f0e8dcb 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -333,7 +333,7 @@ void GeneralHandler::gameStarted() const
     statusWindow->addAttribute(FLEE, _("% Evade"));
     // TRANSLATORS: player stat
     // xgettext:no-c-format
-    statusWindow->addAttribute(CRIT, _("% Critical"));
+    statusWindow->addAttribute(Attributes::CRIT, _("% Critical"));
     // TRANSLATORS: player stat
     statusWindow->addAttribute(Attributes::ATTACK_DELAY, _("Attack Delay"));
     // TRANSLATORS: player stat
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index f2b47c607..2167bf4a9 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -421,7 +421,7 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
     PlayerInfo::setStatBase(FLEE, msg.readInt16("flee"), false);
     PlayerInfo::setStatMod(FLEE, msg.readInt16("flee+"));
 
-    PlayerInfo::setStatBase(CRIT, msg.readInt16("crit"));
+    PlayerInfo::setStatBase(Attributes::CRIT, msg.readInt16("crit"));
 
     PlayerInfo::setStatBase(Attributes::MANNER, msg.readInt16("manner"));
     msg.readInt16("unused?");