Core/Warden: Some Warden refactors lifted from #25286.

(cherry picked from commit 5b4288f05f7e2360bcdc80872787ee2e7a7a2f56)

1 files changed, 14 insertions, 14 deletions

diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp
index b328eaee6ca..e8db4c00b2c 100644
--- a/src/server/game/Warden/WardenCheckMgr.cpp
+++ b/src/server/game/Warden/WardenCheckMgr.cpp
@@ -53,7 +53,7 @@ void WardenCheckMgr::LoadWardenChecks()
 
     uint16 maxCheckId = fields[0].GetUInt16();
 
-    CheckStore.resize(maxCheckId + 1);
+    _checks.resize(maxCheckId + 1);
 
     //                                    0    1     2     3        4       5      6      7
     result = WorldDatabase.Query("SELECT id, type, data, result, address, length, str, comment FROM warden_checks ORDER BY id ASC");
@@ -64,11 +64,11 @@ void WardenCheckMgr::LoadWardenChecks()
         fields = result->Fetch();
 
         uint16 const id  = fields[0].GetUInt16();
-        uint8 const type = fields[1].GetUInt8();
+        WardenCheckType const type = static_cast<WardenCheckType>(fields[1].GetUInt8());
 
-        WardenCheck& wardenCheck = CheckStore[id];
+        WardenCheck& wardenCheck = _checks[id];
         wardenCheck.CheckId = id;
-        wardenCheck.Type = WardenCheckType(type);
+        wardenCheck.Type = type;
 
         // Initialize action with default action from config
         wardenCheck.Action = WardenActions(sWorld->getIntConfig(CONFIG_WARDEN_CLIENT_FAIL_ACTION));
@@ -77,7 +77,7 @@ void WardenCheckMgr::LoadWardenChecks()
             wardenCheck.Data = fields[2].GetBinary();
 
         if (type == MPQ_CHECK || type == MEM_CHECK)
-            CheckResultStore.emplace(id, fields[3].GetBinary());
+            _checkResults.emplace(id, fields[3].GetBinary());
 
         if (type == MEM_CHECK || type == PAGE_CHECK_A || type == PAGE_CHECK_B || type == PROC_CHECK)
         {
@@ -137,12 +137,12 @@ void WardenCheckMgr::LoadWardenOverrides()
         // Check if action value is in range (0-2, see WardenActions enum)
         if (action > WARDEN_ACTION_BAN)
             TC_LOG_ERROR("warden", "Warden check override action out of range (ID: %u, action: %u)", checkId, action);
-        // Check if check actually exists before accessing the CheckStore vector
-        else if (checkId >= CheckStore.size())
+        // Check if check actually exists before accessing the _checks vector
+        else if (checkId >= _checks.size())
             TC_LOG_ERROR("warden", "Warden check action override for non-existing check (ID: %u, action: %u), skipped", checkId, action);
         else
         {
-            CheckStore[checkId].Action = WardenActions(action);
+            _checks[checkId].Action = WardenActions(action);
             ++count;
         }
     }
@@ -157,15 +157,15 @@ WardenCheckMgr* WardenCheckMgr::instance()
     return &instance;
 }
 
-WardenCheck const& WardenCheckMgr::GetCheckDataById(uint16 Id) const
+WardenCheck const& WardenCheckMgr::GetCheckData(uint16 Id) const
 {
-    ASSERT(Id < CheckStore.size(), "Requested Warden data for invalid check ID %u", uint32(Id));
-    return CheckStore[Id];
+    ASSERT(Id < _checks.size(), "Requested Warden data for invalid check ID %u", uint32(Id));
+    return _checks[Id];
 }
 
-WardenCheckResult const& WardenCheckMgr::GetCheckResultById(uint16 Id) const
+WardenCheckResult const& WardenCheckMgr::GetCheckResult(uint16 Id) const
 {
-    auto it = CheckResultStore.find(Id);
-    ASSERT(it != CheckResultStore.end(), "Requested Warden result for invalid check ID %u", uint32(Id));
+    auto it = _checkResults.find(Id);
+    ASSERT(it != _checkResults.end(), "Requested Warden result for invalid check ID %u", uint32(Id));
     return it->second;
 }