diff options
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index ff880c628af..3de318ff030 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -782,7 +782,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (e.action.removeAura.charges) { if (Aura* aur = (*itr)->ToUnit()->GetAura(e.action.removeAura.spell)) - aur->ModCharges(-e.action.removeAura.charges, AURA_REMOVE_BY_EXPIRE); + aur->ModCharges(-static_cast<int32>(e.action.removeAura.charges), AURA_REMOVE_BY_EXPIRE); } else (*itr)->ToUnit()->RemoveAurasDueToSpell(e.action.removeAura.spell); diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 6cc8ada629d..ac3625ca3f4 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -359,17 +359,17 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const bool EnablePortals = false; bool PlayHoverAnim = false; bool IsSuppressingGreetings = false; - bool HasMovementUpdate = flags & UPDATEFLAG_LIVING; - bool HasMovementTransport = flags & UPDATEFLAG_TRANSPORT_POSITION; - bool Stationary = flags & UPDATEFLAG_STATIONARY_POSITION; - bool CombatVictim = flags & UPDATEFLAG_HAS_TARGET; - bool ServerTime = flags & UPDATEFLAG_TRANSPORT; - bool VehicleCreate = flags & UPDATEFLAG_VEHICLE; - bool AnimKitCreate = flags & UPDATEFLAG_ANIMKITS; - bool Rotation = flags & UPDATEFLAG_ROTATION; + bool HasMovementUpdate = flags & UPDATEFLAG_LIVING ? true : false; + bool HasMovementTransport = flags & UPDATEFLAG_TRANSPORT_POSITION ? true : false; + bool Stationary = flags & UPDATEFLAG_STATIONARY_POSITION ? true : false; + bool CombatVictim = flags & UPDATEFLAG_HAS_TARGET ? true : false; + bool ServerTime = flags & UPDATEFLAG_TRANSPORT ? true : false; + bool VehicleCreate = flags & UPDATEFLAG_VEHICLE ? true : false; + bool AnimKitCreate = flags & UPDATEFLAG_ANIMKITS ? true : false; + bool Rotation = flags & UPDATEFLAG_ROTATION ? true : false; bool HasAreaTrigger = false; bool HasGameObject = false; - bool ThisIsYou = flags & UPDATEFLAG_SELF; + bool ThisIsYou = flags & UPDATEFLAG_SELF ? true : false; bool ReplaceActive = false; bool SceneObjCreate = false; bool ScenePendingInstances = false; |