diff options
| author | Intel <chemicstry@gmail.com> | 2014-11-08 15:10:14 +0200 |
|---|---|---|
| committer | Intel <chemicstry@gmail.com> | 2014-11-08 15:10:14 +0200 |
| commit | 7b287bdf383dc8fd099ffded8e100ce60e20bb15 (patch) | |
| tree | 9770b6ffa77f2170b7e7d3876817c6a57816d15c /src/server/game/Entities | |
| parent | 7c72f27b7c83b10636e57e30ca036f5b6bc5820e (diff) | |
Core/DataStores: Updated ChrClassesXPowerTypes.dbc, CinematicSequences.dbc, CreatureDisplayInfo.dbc, CreatureDisplayInfoExtra.dbc structs
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1d322cf61eb..d97bc4da22d 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -27253,13 +27253,13 @@ float Player::GetCollisionHeight(bool mounted) const if (!mountDisplayInfo) return GetCollisionHeight(false); - CreatureModelDataEntry const* mountModelData = sCreatureModelDataStore.LookupEntry(mountDisplayInfo->ModelId); + CreatureModelDataEntry const* mountModelData = sCreatureModelDataStore.LookupEntry(mountDisplayInfo->ModelID); if (!mountModelData) return GetCollisionHeight(false); CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId()); ASSERT(displayInfo); - CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelId); + CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelID); ASSERT(modelData); float scaleMod = GetObjectScale(); // 99% sure about this @@ -27271,7 +27271,7 @@ float Player::GetCollisionHeight(bool mounted) const //! Dismounting case - use basic default model data CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId()); ASSERT(displayInfo); - CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelId); + CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelID); ASSERT(modelData); return modelData->CollisionHeight; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4593288d548..6013e02c11a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11465,12 +11465,12 @@ bool Unit::IsInDisallowedMountForm() const if (!display) return true; - CreatureDisplayInfoExtraEntry const* displayExtra = sCreatureDisplayInfoExtraStore.LookupEntry(display->ExtraId); + CreatureDisplayInfoExtraEntry const* displayExtra = sCreatureDisplayInfoExtraStore.LookupEntry(display->ExtendedDisplayInfoID); if (!displayExtra) return true; - CreatureModelDataEntry const* model = sCreatureModelDataStore.LookupEntry(display->ModelId); - ChrRacesEntry const* race = sChrRacesStore.LookupEntry(displayExtra->Race); + CreatureModelDataEntry const* model = sCreatureModelDataStore.LookupEntry(display->ModelID); + ChrRacesEntry const* race = sChrRacesStore.LookupEntry(displayExtra->DisplayRaceID); if (model && !(model->Flags & 0x80)) if (race && !(race->Flags & 0x4)) |