diff options
| author | QAston <qaston@gmail.com> | 2011-09-11 11:41:30 +0200 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-09-11 11:41:55 +0200 |
| commit | 06b9ae6e11c9473e494b3ae86577e7dbb9f2961f (patch) | |
| tree | 3bf6b9b7299e6930d1d580ed3acf58a7cf7b5d68 | |
| parent | 1fef67187b537460657009da93d5e1e175e93892 (diff) | |
Core/Unit: Define UNIT_FLAG_UNK_0 as UNIT_FLAG_SERVER_CONTROLLED and remove related redundant creature_template data.
| -rw-r--r-- | sql/updates/world/2011_09_11_00_world_creature_template.sql | 1 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sql/updates/world/2011_09_11_00_world_creature_template.sql b/sql/updates/world/2011_09_11_00_world_creature_template.sql new file mode 100644 index 00000000000..a4bf485350b --- /dev/null +++ b/sql/updates/world/2011_09_11_00_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `unit_flags` = `unit_flags` &~1 WHERE `unit_flags` & 1;
\ No newline at end of file diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 815892ed3b0..cb4bd39347b 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -572,7 +572,7 @@ enum DamageEffectType // Value masks for UNIT_FIELD_FLAGS enum UnitFlags { - UNIT_FLAG_UNK_0 = 0x00000001, + UNIT_FLAG_SERVER_CONTROLLED = 0x00000001, // set only when unit movement is controlled by server - by SPLINE/MONSTER_MOVE packets, together with UNIT_FLAG_STUNNED; only set to units controlled by client; client function CGUnit_C::IsClientControlled returns false when set for owner UNIT_FLAG_NON_ATTACKABLE = 0x00000002, // not attackable UNIT_FLAG_DISABLE_MOVE = 0x00000004, UNIT_FLAG_PVP_ATTACKABLE = 0x00000008, // allow apply pvp rules to attackable state in addition to faction dependent state diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 26b200bdbbc..3c8b62bf64a 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -978,7 +978,7 @@ class spell_xt002_submerged : public SpellScriptLoader if (!caster) return; - caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_0 | UNIT_FLAG_NOT_SELECTABLE); + caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); caster->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_SUBMERGED); } @@ -1009,7 +1009,7 @@ class spell_xt002_stand : public SpellScriptLoader if (!target) return; - target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_0 | UNIT_FLAG_NOT_SELECTABLE); + target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); target->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_STAND); } |