diff options
| author | megamage <none@none> | 2009-01-19 20:26:49 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-19 20:26:49 -0600 |
| commit | 1bbd8968615e4b89fe4549bd1cccd089f6ad38f0 (patch) | |
| tree | 03fac7e4fc28dd1ee822faf923dd7475003e13ae /src/game | |
| parent | 40e7dcb599c1e596151356a4cc4d6f641bc1ec05 (diff) | |
| parent | d1f6472e2bb6c55d6e837eefdeb7efdd10018a81 (diff) | |
*Update to trinity 921.
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/Unit.h | 12 | ||||
| -rw-r--r-- | src/game/World.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/game/Unit.h b/src/game/Unit.h index 6ee3a6dc85c..4798c179ebd 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -371,7 +371,7 @@ enum UnitState UNIT_STAT_STUNNED = 0x00000008, UNIT_STAT_ROAMING = 0x00000010, UNIT_STAT_CHASE = 0x00000020, - UNIT_STAT_SEARCHING = 0x00000040, + //UNIT_STAT_SEARCHING = 0x00000040, UNIT_STAT_FLEEING = 0x00000080, UNIT_STAT_IN_FLIGHT = 0x00000100, // player is in flight mode UNIT_STAT_FOLLOW = 0x00000200, @@ -383,9 +383,9 @@ enum UnitState UNIT_STAT_CASTING = 0x00008000, UNIT_STAT_POSSESSED = 0x00010000, UNIT_STAT_CHARGING = 0x00020000, - UNIT_STAT_MOVING = (UNIT_STAT_ROAMING | UNIT_STAT_CHASE | UNIT_STAT_SEARCHING | UNIT_STAT_FOLLOW), + UNIT_STAT_MOVING = (UNIT_STAT_ROAMING | UNIT_STAT_CHASE), UNIT_STAT_LOST_CONTROL = (UNIT_STAT_CONFUSED | UNIT_STAT_STUNNED | UNIT_STAT_FLEEING | UNIT_STAT_CHARGING), - UNIT_STAT_SIGHTLESS = (UNIT_STAT_LOST_CONTROL | UNIT_STAT_CHASE | UNIT_STAT_SEARCHING), + UNIT_STAT_SIGHTLESS = (UNIT_STAT_LOST_CONTROL | UNIT_STAT_CHASE), UNIT_STAT_CANNOT_AUTOATTACK = (UNIT_STAT_LOST_CONTROL | UNIT_STAT_CASTING), UNIT_STAT_ALL_STATE = 0xffffffff //(UNIT_STAT_STOPPED | UNIT_STAT_MOVING | UNIT_STAT_IN_COMBAT | UNIT_STAT_IN_FLIGHT) }; @@ -1480,8 +1480,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject AuraMap m_Auras; - std::list<Aura *> m_scAuras; // casted singlecast auras - typedef std::list<uint64> DynObjectGUIDs; DynObjectGUIDs m_dynObjGUIDs; @@ -1491,9 +1489,11 @@ class TRINITY_DLL_SPEC Unit : public WorldObject uint32 m_removedAuras; AuraList m_modAuras[TOTAL_AURAS]; - uint32 m_interruptMask; + AuraList m_scAuras; // casted singlecast auras AuraList m_interruptableAuras; AuraList m_ccAuras; + uint32 m_interruptMask; + float m_auraModifiersGroup[UNIT_MOD_END][MODIFIER_TYPE_END]; float m_weaponDamage[MAX_ATTACK][2]; bool m_canModifyStats; diff --git a/src/game/World.cpp b/src/game/World.cpp index 1e1ca227d1b..b07be31b66a 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -3059,7 +3059,7 @@ void World::UpdateMaxSessionCounters() void World::LoadDBVersion() { - QueryResult* result = WorldDatabase.Query("SELECT version FROM db_version LIMIT 1"); + QueryResult* result = WorldDatabase.Query("SELECT db_version FROM version LIMIT 1"); if(result) { Field* fields = result->Fetch(); |