Move TransferAbortReason to remove enum forward declaration

cmangos · Jul 4, 2024 · fee0d75 · fee0d75
1 parent 08937ec
commit fee0d75
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/game/Entities/Player.h b/src/game/Entities/Player.h
@@ -634,16 +634,6 @@ enum TradeSlots
     TRADE_SLOT_NONTRADED        = 6
 };
 
-// [-ZERO] Need fix, or maybe not exists
-enum TransferAbortReason
-{
-    TRANSFER_ABORT_NONE                         = 0x00,
-    TRANSFER_ABORT_MAX_PLAYERS                  = 0x01,     // Transfer Aborted: instance is full
-    TRANSFER_ABORT_NOT_FOUND                    = 0x02,     // Transfer Aborted: instance not found
-    TRANSFER_ABORT_TOO_MANY_INSTANCES           = 0x03,     // You have entered too many instances recently.
-    TRANSFER_ABORT_ZONE_IN_COMBAT               = 0x05,     // Unable to zone in while an encounter is in progress.
-};
-
 enum InstanceResetWarningType
 {
     RAID_INSTANCE_WARNING_HOURS     = 1,                    // WARNING! %s is scheduled to reset in %d hour(s).

diff --git a/src/game/Server/WorldSession.h b/src/game/Server/WorldSession.h
@@ -38,8 +38,6 @@
 #include <mutex>
 #include <memory>
 
-enum TransferAbortReason;
-
 struct ItemPrototype;
 struct AuctionEntry;
 struct AuctionHouseEntry;
@@ -134,6 +132,15 @@ enum WorldSessionState
     WORLD_SESSION_STATE_OFFLINE        = 3
 };
 
+enum TransferAbortReason
+{
+    TRANSFER_ABORT_NONE                         = 0x00,
+    TRANSFER_ABORT_MAX_PLAYERS                  = 0x01,     // Transfer Aborted: instance is full
+    TRANSFER_ABORT_NOT_FOUND                    = 0x02,     // Transfer Aborted: instance not found
+    TRANSFER_ABORT_TOO_MANY_INSTANCES           = 0x03,     // You have entered too many instances recently.
+    TRANSFER_ABORT_ZONE_IN_COMBAT               = 0x05,     // Unable to zone in while an encounter is in progress.
+};
+
 struct CharacterNameQueryResponse
 {
     ObjectGuid          guid;                   // pc's guid