Server/Misc: convert LockType to enum class

ProjectSkyfire · Mar 19, 2021 · 375bd26 · 375bd26
1 parent 35c6bab
commit 375bd26
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
@@ -3032,31 +3032,31 @@ enum LockKeyType
     LOCK_KEY_SKILL = 2
 };
 
-enum LockType
+enum class LockType
 {
-    LOCKTYPE_PICKLOCK              = 1,
-    LOCKTYPE_HERBALISM             = 2,
-    LOCKTYPE_MINING                = 3,
-    LOCKTYPE_DISARM_TRAP           = 4,
-    LOCKTYPE_OPEN                  = 5,
-    LOCKTYPE_TREASURE              = 6,
-    LOCKTYPE_CALCIFIED_ELVEN_GEMS  = 7,
-    LOCKTYPE_CLOSE                 = 8,
-    LOCKTYPE_ARM_TRAP              = 9,
-    LOCKTYPE_QUICK_OPEN            = 10,
-    LOCKTYPE_QUICK_CLOSE           = 11,
-    LOCKTYPE_OPEN_TINKERING        = 12,
-    LOCKTYPE_OPEN_KNEELING         = 13,
-    LOCKTYPE_OPEN_ATTACKING        = 14,
-    LOCKTYPE_GAHZRIDIAN            = 15,
-    LOCKTYPE_BLASTING              = 16,
-    LOCKTYPE_PVP_OPEN              = 17,
-    LOCKTYPE_PVP_CLOSE             = 18,
-    LOCKTYPE_FISHING               = 19,
-    LOCKTYPE_INSCRIPTION           = 20,
-    LOCKTYPE_OPEN_FROM_VEHICLE     = 21,
-    LOCKTYPE_ARCHAEOLOGY           = 22,
-    LOCKTYPE_PVP_QUICK_OPEN        = 23
+    PICKLOCK              = 1,
+    HERBALISM             = 2,
+    MINING                = 3,
+    DISARM_TRAP           = 4,
+    OPEN                  = 5,
+    TREASURE              = 6,
+    CALCIFIED_ELVEN_GEMS  = 7,
+    CLOSE                 = 8,
+    ARM_TRAP              = 9,
+    QUICK_OPEN            = 10,
+    QUICK_CLOSE           = 11,
+    OPEN_TINKERING        = 12,
+    OPEN_KNEELING         = 13,
+    OPEN_ATTACKING        = 14,
+    GAHZRIDIAN            = 15,
+    BLASTING              = 16,
+    PVP_OPEN              = 17,
+    PVP_CLOSE             = 18,
+    FISHING               = 19,
+    INSCRIPTION           = 20,
+    OPEN_FROM_VEHICLE     = 21,
+    ARCHAEOLOGY           = 22,
+    PVP_QUICK_OPEN        = 23
 };
 
 enum TrainerType                                            // this is important type for npcs!
@@ -3547,11 +3547,11 @@ inline SkillType SkillByLockType(LockType locktype)
 {
     switch (locktype)
     {
-        case LOCKTYPE_HERBALISM:   return SKILL_HERBALISM;
-        case LOCKTYPE_MINING:      return SKILL_MINING;
-        case LOCKTYPE_FISHING:     return SKILL_FISHING;
-        case LOCKTYPE_INSCRIPTION: return SKILL_INSCRIPTION;
-        case LOCKTYPE_ARCHAEOLOGY: return SKILL_ARCHAEOLOGY;
+        case LockType::HERBALISM:   return SKILL_HERBALISM;
+        case LockType::MINING:      return SKILL_MINING;
+        case LockType::FISHING:     return SKILL_FISHING;
+        case LockType::INSCRIPTION: return SKILL_INSCRIPTION;
+        case LockType::ARCHAEOLOGY: return SKILL_ARCHAEOLOGY;
         default: break;
     }
     return SKILL_NONE;

diff --git a/src/server/scripts/Pandaria/StormstoutBrewery/stormstout_brewery.h b/src/server/scripts/Pandaria/StormstoutBrewery/stormstout_brewery.h
@@ -47,8 +47,8 @@ enum GameObjectIds
     // doors
 };
 
-Position const OokOokLandPos = { -754.695, 1348.25f, 147.35f, 1.83f };
-Position const BananaFleePos = { -771.177, 1407.86f, 139.57f, 1.86f };
+Position const OokOokLandPos = { -754.695f, 1348.25f, 147.35f, 1.83f };
+Position const BananaFleePos = { -771.177f, 1407.86f, 139.57f, 1.86f };
 
 Position const HoptallusLandPos = { -697.232f, 1260.42f, 162.79f, 0.33f };