diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-03-29 11:30:49 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-29 11:30:49 +0200 |
| commit | d611925dc7ab2b3f19c5ee9e0f75b8dfb6de1291 (patch) | |
| tree | 4428ac0728c043ca1cb4fc55427f87268ab4860c /src/server/scripts/Events | |
| parent | c02b829788cb274a68b125aee4dab35b9a56a2b8 (diff) | |
Core/Units: Reduce differences between branches part 1 - unit updatefield accessors
Diffstat (limited to 'src/server/scripts/Events')
| -rw-r--r-- | src/server/scripts/Events/hallows_end.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/Events/operation_gnomeregan.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Events/zalazane_fall.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp index 03a07e69e37..1ed0500eb40 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -140,16 +140,16 @@ class spell_hallow_end_trick : public SpellScript switch (urand(0, 5)) { case 1: - spellId = gender ? SPELL_LEPER_GNOME_COSTUME_FEMALE : SPELL_LEPER_GNOME_COSTUME_MALE; + spellId = gender == GENDER_FEMALE ? SPELL_LEPER_GNOME_COSTUME_FEMALE : SPELL_LEPER_GNOME_COSTUME_MALE; break; case 2: - spellId = gender ? SPELL_PIRATE_COSTUME_FEMALE : SPELL_PIRATE_COSTUME_MALE; + spellId = gender == GENDER_FEMALE ? SPELL_PIRATE_COSTUME_FEMALE : SPELL_PIRATE_COSTUME_MALE; break; case 3: - spellId = gender ? SPELL_GHOST_COSTUME_FEMALE : SPELL_GHOST_COSTUME_MALE; + spellId = gender == GENDER_FEMALE ? SPELL_GHOST_COSTUME_FEMALE : SPELL_GHOST_COSTUME_MALE; break; case 4: - spellId = gender ? SPELL_NINJA_COSTUME_FEMALE : SPELL_NINJA_COSTUME_MALE; + spellId = gender == GENDER_FEMALE ? SPELL_NINJA_COSTUME_FEMALE : SPELL_NINJA_COSTUME_MALE; break; case 5: spellId = SPELL_SKELETON_COSTUME; diff --git a/src/server/scripts/Events/operation_gnomeregan.cpp b/src/server/scripts/Events/operation_gnomeregan.cpp index 656f7fc7dd4..99365f3faab 100644 --- a/src/server/scripts/Events/operation_gnomeregan.cpp +++ b/src/server/scripts/Events/operation_gnomeregan.cpp @@ -54,10 +54,10 @@ class spell_operation_gnomeregan_basic_orders_emote : public AuraScript target->HandleEmoteCommand(EMOTE_ONESHOT_CHEER); break; case SPELL_TEST_DANCE: - target->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_DANCE); + target->SetEmoteState(EMOTE_STATE_DANCE); break; case SPELL_TEST_STOP_DANCE: - target->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); + target->SetEmoteState(EMOTE_STATE_NONE); break; default: return; diff --git a/src/server/scripts/Events/zalazane_fall.cpp b/src/server/scripts/Events/zalazane_fall.cpp index 1b0e2e856f9..cdebdca63d8 100644 --- a/src/server/scripts/Events/zalazane_fall.cpp +++ b/src/server/scripts/Events/zalazane_fall.cpp @@ -187,7 +187,7 @@ struct npc_tiger_matriarch : public ScriptedAI if (HealthBelowPct(20)) { damage = 0; - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); if (Unit* vehSummoner = attacker->ToTempSummon()->GetSummonerUnit()) { vehSummoner->AddAura(SPELL_SUMMON_ZENTABRA_TRIGGER, vehSummoner); |