diff options
author | Shauren <shauren.trinity@gmail.com> | 2023-08-15 13:00:43 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2023-08-15 13:00:43 +0200 |
commit | 825c697a764017349ca94ecfca8f30a8365666c0 (patch) | |
tree | 83274f0a06a8b5f59bdb6ff2937f9f4a77efb179 | |
parent | ede36202162fc7daa49ed2ef51948f65418dd1bc (diff) |
Core/Misc: Removed structure bitfield definitions that don't do anything
-rw-r--r-- | src/server/game/Entities/Player/Player.h | 8 | ||||
-rw-r--r-- | src/server/game/Grids/NGrid.h | 2 | ||||
-rw-r--r-- | src/server/game/Instances/InstanceSaveMgr.h | 2 | ||||
-rw-r--r-- | src/server/game/Loot/Loot.h | 2 | ||||
-rw-r--r-- | src/server/game/Movement/Spline/MoveSplineFlag.h | 2 | ||||
-rw-r--r-- | src/server/game/Reputation/ReputationMgr.h | 8 | ||||
-rw-r--r-- | src/server/game/Spells/Auras/SpellAuraDefines.h | 2 | ||||
-rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.h | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 107bfff4799..d67225835a1 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -114,7 +114,7 @@ enum BuyBankSlotResult ERR_BANKSLOT_OK = 3 }; -enum PlayerSpellState +enum PlayerSpellState : uint8 { PLAYERSPELL_UNCHANGED = 0, PLAYERSPELL_CHANGED = 1, @@ -125,7 +125,7 @@ enum PlayerSpellState struct PlayerSpell { - PlayerSpellState state : 8; + PlayerSpellState state; bool active : 1; // show in spellbook bool dependent : 1; // learned as result another spell learn, skill grow, quest reward, etc bool disabled : 1; // first rank has been learned in result talent learn but currently talent unlearned, save max learned ranks @@ -133,8 +133,8 @@ struct PlayerSpell struct PlayerTalent { - PlayerSpellState state : 8; - uint8 spec : 8; + PlayerSpellState state; + uint8 spec; }; // Spell modifier (used for modify other spells) diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h index 9ffa4858978..e90d7f38004 100644 --- a/src/server/game/Grids/NGrid.h +++ b/src/server/game/Grids/NGrid.h @@ -48,7 +48,7 @@ private: TimeTracker i_timer; PeriodicTimer vis_Update; - uint16 i_unloadActiveLockCount : 16; // lock from active object spawn points (prevent clone loading) + uint16 i_unloadActiveLockCount; // lock from active object spawn points (prevent clone loading) bool i_unloadExplicitLock : 1; // explicit manual lock or config setting bool i_unloadReferenceLock : 1; // lock from instance map copy }; diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 9efad6bbd1b..9f0b437f34e 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -166,7 +166,7 @@ class TC_GAME_API InstanceSaveManager struct InstResetEvent { uint8 type; - Difficulty difficulty:8; + Difficulty difficulty; uint16 mapid; uint16 instanceId; diff --git a/src/server/game/Loot/Loot.h b/src/server/game/Loot/Loot.h index 51e5a58fb81..f21ec27f4c1 100644 --- a/src/server/game/Loot/Loot.h +++ b/src/server/game/Loot/Loot.h @@ -131,7 +131,7 @@ struct TC_GAME_API LootItem ConditionContainer conditions; // additional loot condition GuidSet allowedGUIDs; ObjectGuid rollWinnerGUID; // Stores the guid of person who won loot, if his bags are full only he can see the item in loot list! - uint8 count : 8; + uint8 count; bool is_looted : 1; bool is_blocked : 1; bool freeforall : 1; // free for all diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h index 7a6df3fadb9..4bd7ff12545 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -102,7 +102,7 @@ namespace Movement void EnableTransportEnter() { raw() = (raw() & ~TransportExit) | TransportEnter; } void EnableTransportExit() { raw() = (raw() & ~TransportEnter) | TransportExit; } - uint8 animTier : 8; + uint8 animTier; bool done : 1; bool falling : 1; bool no_spline : 1; diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index 5a9b999cf7b..d665a3ef556 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -153,10 +153,10 @@ class TC_GAME_API ReputationMgr Player* _player; FactionStateList _factions; ForcedReactions _forcedReactions; - uint8 _visibleFactionCount :8; - uint8 _honoredFactionCount :8; - uint8 _reveredFactionCount :8; - uint8 _exaltedFactionCount :8; + uint8 _visibleFactionCount; + uint8 _honoredFactionCount; + uint8 _reveredFactionCount; + uint8 _exaltedFactionCount; bool _sendFactionIncreased; //! Play visual effect on next SMSG_SET_FACTION_STANDING sent }; diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index d9569464dbb..ef2138eb879 100644 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -58,7 +58,7 @@ enum AuraEffectHandleModes AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK = (AURA_EFFECT_HANDLE_REAPPLY | AURA_EFFECT_HANDLE_REAL) }; -enum AuraRemoveMode +enum AuraRemoveMode : uint8 { AURA_REMOVE_NONE = 0, AURA_REMOVE_BY_DEFAULT = 1, // scripted remove, remove by stack with aura with different ids and sc aura remove diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index b6c1ca5e6b5..126f11141b3 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -49,11 +49,11 @@ class TC_GAME_API AuraApplication private: Unit* const _target; Aura* const _base; - AuraRemoveMode _removeMode:8; // Store info for know remove aura reason + AuraRemoveMode _removeMode; // Store info for know remove aura reason uint8 _slot; // Aura slot on unit uint8 _flags; // Aura info flag uint8 _effectsToApply; // Used only at spell hit to determine which effect should be applied - bool _needClientUpdate:1; + bool _needClientUpdate; explicit AuraApplication(Unit* target, Unit* caster, Aura* base, uint8 effMask); void _Remove(); |