Core/Misc: Minimize branch differences

This commit is contained in:
Aokromes committed 2017-03-13 09:52:07 +01:00
1 parent 2852b76c0f
commit 41c30413c9
5 files changed
+6 -6

No files matched your search

@@ -2522,7 +2522,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (IsCreature(*itr))
{
if (e.action.animKit.type == 0)
(*itr)->ToCreature()->PlayOneShotAnimKit(e.action.animKit.animKit);
(*itr)->ToCreature()->PlayOneShotAnimKitId(e.action.animKit.animKit);
else if (e.action.animKit.type == 1)
(*itr)->ToCreature()->SetAIAnimKitId(e.action.animKit.animKit);
else if (e.action.animKit.type == 2)
+1 -1
View File
@@ -13999,7 +13999,7 @@ void Unit::SendDurabilityLoss(Player* receiver, uint32 percent)
receiver->GetSession()->SendPacket(&data);
}
void Unit::PlayOneShotAnimKit(uint16 animKitId)
void Unit::PlayOneShotAnimKitId(uint16 animKitId)
{
WorldPacket data(SMSG_PLAY_ONE_SHOT_ANIM_KIT, 7+2);
data << GetPackGUID();
+1 -1
View File
@@ -1459,7 +1459,7 @@ class TC_GAME_API Unit : public WorldObject
MountCapabilityEntry const* GetMountCapability(uint32 mountType) const;
void SendDurabilityLoss(Player* receiver, uint32 percent);
void PlayOneShotAnimKit(uint16 animKitId);
void PlayOneShotAnimKitId(uint16 animKitId);
uint16 GetMaxSkillValueForLevel(Unit const* target = NULL) const { return (target ? getLevelForTarget(target) : getLevel()) * 5; }
void DealDamageMods(Unit* victim, uint32 &damage, uint32* absorb);
+1 -1
View File
@@ -897,7 +897,7 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_PLAY_ANIMKIT:
// Source must be Creature.
if (Creature* cSource = _GetScriptCreature(source, true, step.script))
cSource->PlayOneShotAnimKit(step.script->PlayAnimKit.AnimKitID);
cSource->PlayOneShotAnimKitId(step.script->PlayAnimKit.AnimKitID);
break;
default:
@@ -281,7 +281,7 @@ class npc_blazing_monstrosity : public CreatureScript
{
DoZoneInCombat();
me->RemoveAurasDueToSpell(SPELL_SLEEP_ULTRA_HIGH_PRIORITY);
me->PlayOneShotAnimKit(ANIM_KIT_BIRD_WAKE);
me->PlayOneShotAnimKitId(ANIM_KIT_BIRD_WAKE);
_events.Reset();
_events.ScheduleEvent(EVENT_START_SPITTING, 6000);
_events.ScheduleEvent(EVENT_CONTINUE_SPITTING, 9000);
@@ -602,7 +602,7 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader
void TurnBird(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
GetHitUnit()->PlayOneShotAnimKit(ANIM_KIT_BIRD_TURN);
GetHitUnit()->PlayOneShotAnimKitId(ANIM_KIT_BIRD_TURN);
}
void Register() override