aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/DataStores/DBCStores.cpp16
-rw-r--r--src/server/game/DataStores/DBCStores.h1
-rw-r--r--src/server/game/DataStores/DBCStructure.h190
-rw-r--r--src/server/game/DataStores/DBCfmt.h8
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.cpp2
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.h8
-rw-r--r--src/server/game/Entities/Player/Player.cpp30
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp20
-rw-r--r--src/server/game/Handlers/MailHandler.cpp2
-rw-r--r--src/server/game/Maps/Map.cpp2
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp2
11 files changed, 138 insertions, 143 deletions
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 1baa3441226..1acb88b9ae5 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -166,7 +166,6 @@ DBCStorage <MountTypeEntry> sMountTypeStore(MountTypefmt);
DBCStorage <NameGenEntry> sNameGenStore(NameGenfmt);
NameGenVectorArraysMap sGenNameVectoArraysMap;
-DBCStorage <NumTalentsAtLevelEntry> sNumTalentsAtLevelStore(NumTalentsAtLevelfmt);
DBCStorage <OverrideSpellDataEntry> sOverrideSpellDataStore(OverrideSpellDatafmt);
@@ -486,7 +485,7 @@ void LoadDBCStores(const std::string& dataPath)
sMapDifficultyMap[MAKE_PAIR32(0, 0)] = MapDifficulty(0, 0, false);//map 0 is missingg from MapDifficulty.dbc use this till its ported to sql
for (uint32 i = 0; i < sMapDifficultyStore.GetNumRows(); ++i)
if (MapDifficultyEntry const* entry = sMapDifficultyStore.LookupEntry(i))
- sMapDifficultyMap[MAKE_PAIR32(entry->MapId, entry->Difficulty)] = MapDifficulty(entry->resetTime, entry->maxPlayers, entry->areaTriggerText[0] > 0);
+ sMapDifficultyMap[MAKE_PAIR32(entry->MapID, entry->DifficultyID)] = MapDifficulty(entry->RaidDuration, entry->MaxPlayers, entry->Message_lang[0] > 0);
sMapDifficultyStore.Clear();
LoadDBC(availableDbcLocales, bad_dbc_files, sMountCapabilityStore, dbcPath, "MountCapability.dbc");//15595
@@ -495,9 +494,8 @@ void LoadDBCStores(const std::string& dataPath)
LoadDBC(availableDbcLocales, bad_dbc_files, sNameGenStore, dbcPath, "NameGen.dbc");//15595
for (uint32 i = 0; i < sNameGenStore.GetNumRows(); ++i)
if (NameGenEntry const* entry = sNameGenStore.LookupEntry(i))
- sGenNameVectoArraysMap[entry->race].stringVectorArray[entry->gender].push_back(std::string(entry->name));
+ sGenNameVectoArraysMap[entry->Race].stringVectorArray[entry->Sex].push_back(std::string(entry->Name));
sNameGenStore.Clear();
- LoadDBC(availableDbcLocales, bad_dbc_files, sNumTalentsAtLevelStore, dbcPath, "NumTalentsAtLevel.dbc");//15595
LoadDBC(availableDbcLocales, bad_dbc_files, sMovieStore, dbcPath, "Movie.dbc");//15595
@@ -508,8 +506,8 @@ void LoadDBCStores(const std::string& dataPath)
for (uint32 i = 0; i < sPhaseGroupStore.GetNumRows(); ++i)
if (PhaseGroupEntry const* group = sPhaseGroupStore.LookupEntry(i))
- if (PhaseEntry const* phase = sPhaseStore.LookupEntry(group->PhaseId))
- sPhasesByGroup[group->GroupId].insert(phase->ID);
+ if (PhaseEntry const* phase = sPhaseStore.LookupEntry(group->PhaseID))
+ sPhasesByGroup[group->PhaseGroupID].insert(phase->ID);
LoadDBC(availableDbcLocales, bad_dbc_files, sPowerDisplayStore, dbcPath, "PowerDisplay.dbc");
@@ -1306,7 +1304,7 @@ LFGDungeonEntry const* GetLFGDungeon(uint32 mapId, Difficulty difficulty)
if (!dungeon)
continue;
- if (dungeon->map == int32(mapId) && Difficulty(dungeon->difficulty) == difficulty)
+ if (dungeon->MapID == int32(mapId) && Difficulty(dungeon->DifficultyID) == difficulty)
return dungeon;
}
@@ -1321,8 +1319,8 @@ uint32 GetDefaultMapLight(uint32 mapId)
if (!light)
continue;
- if (light->MapId == mapId && light->X == 0.0f && light->Y == 0.0f && light->Z == 0.0f)
- return light->Id;
+ if (light->MapID == mapId && light->Pos.X == 0.0f && light->Pos.Y == 0.0f && light->Pos.Z == 0.0f)
+ return light->ID;
}
return 0;
diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
index bc514374157..d5868fb94d3 100644
--- a/src/server/game/DataStores/DBCStores.h
+++ b/src/server/game/DataStores/DBCStores.h
@@ -180,7 +180,6 @@ extern DBCStorage <MapEntry> sMapStore;
extern DBCStorage <MountCapabilityEntry> sMountCapabilityStore;
extern DBCStorage <MountTypeEntry> sMountTypeStore;
extern DBCStorage <NameGenEntry> sNameGenStore;
-extern DBCStorage <NumTalentsAtLevelEntry> sNumTalentsAtLevelStore;
extern DBCStorage <PhaseEntry> sPhaseStore;
extern DBCStorage <PhaseGroupEntry> sPhaseGroupStore;
//extern DBCStorage <MapDifficultyEntry> sMapDifficultyStore; -- use GetMapDifficultyData insteed
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 125a74b3190..b9a891ccec4 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1286,6 +1286,7 @@ struct ItemPriceBaseEntry
float WeaponFactor; // 4 Price factor for weapons
};
+// 6.x - removeme
struct ItemReforgeEntry
{
uint32 Id;
@@ -1425,100 +1426,100 @@ typedef std::unordered_map<uint32, ItemSetSpells> ItemSetSpellsStore;
struct LFGDungeonEntry
{
- uint32 ID; // 0
- char* name; // 1
- uint32 minlevel; // 2
- uint32 maxlevel; // 3
- uint32 reclevel; // 4
- uint32 recminlevel; // 5
- uint32 recmaxlevel; // 6
- int32 map; // 7
- uint32 difficulty; // 8
- uint32 flags; // 9
- uint32 type; // 10
- //uint32 unk2; // 11
- //char* iconname; // 12
- uint32 expansion; // 13
- //uint32 unk4; // 14
- uint32 grouptype; // 15
- //char* desc; // 16 Description
- uint32 randomCategoryId; // 17 RandomDungeonID assigned for this dungeon
+ uint32 ID; // 0
+ char* Name_lang; // 1
+ uint32 MinLevel; // 2
+ uint32 MaxLevel; // 3
+ uint32 TargetLevel; // 4
+ //uint32 TargetLevelMin; // 5
+ //uint32 TargetLevelMax; // 6
+ int32 MapID; // 7
+ uint32 DifficultyID; // 8
+ uint32 Flags; // 9
+ uint32 Type; // 10
+ //uint32 Faction; // 11
+ //char* TextureFilename; // 12
+ uint32 Expansion; // 13
+ //uint32 OrderIndex; // 14
+ uint32 GroupID; // 15
+ //char* Description_lang; // 16
+ //uint32 RandomID; // 17
+ //uint32 CountTank; // 18
+ //uint32 CountHealer; // 19
+ //uint32 CountDamage; // 20
+ //uint32 ScenarioID; // 21
+ //uint32 SubType; // 22
+ //uint32 BonusReputationAmount; // 23
+ //uint32 MentorCharLevel; // 24
+ //uint32 MentorItemLevel; // 25
+
// Helpers
- uint32 Entry() const { return ID + (type << 24); }
+ uint32 Entry() const { return ID + (Type << 24); }
};
struct LightEntry
{
- uint32 Id;
- uint32 MapId;
- float X;
- float Y;
- float Z;
- //float FalloffStart;
- //float FalloffEnd;
- //uint32 SkyAndFog;
- //uint32 WaterSettings;
- //uint32 SunsetParams;
- //uint32 OtherParams;
- //uint32 DeathParams;
- //uint32 Unknown;
- //uint32 Unknown;
- //uint32 Unknown;
+ uint32 ID; // 0
+ uint32 MapID; // 1
+ DBCPosition3D Pos; // 2-4
+ //float FalloffStart; // 5
+ //float FalloffEnd; // 6
+ //uint32 LightParamsID[8]; // 7-14
};
struct LiquidTypeEntry
{
- uint32 Id;
- //char* Name;
- //uint32 Flags;
- uint32 Type;
- //uint32 SoundId;
- uint32 SpellId;
- //float MaxDarkenDepth;
- //float FogDarkenIntensity;
- //float AmbDarkenIntensity;
- //float DirDarkenIntensity;
- //uint32 LightID;
- //float ParticleScale;
- //uint32 ParticleMovement;
- //uint32 ParticleTexSlots;
- //uint32 LiquidMaterialID;
- //char* Texture[6];
- //uint32 Color[2];
- //float Unk1[18];
- //uint32 Unk2[4];
+ uint32 ID; // 0
+ //char* Name; // 1
+ //uint32 Flags; // 2
+ uint32 Type; // 3 m_soundBank
+ //uint32 SoundID; // 4
+ uint32 SpellID; // 5
+ //float MaxDarkenDepth; // 6
+ //float FogDarkenIntensity; // 7
+ //float AmbDarkenIntensity; // 8
+ //float DirDarkenIntensity; // 9
+ //uint32 LightID; // 10
+ //float ParticleScale; // 11
+ //uint32 ParticleMovement; // 12
+ //uint32 ParticleTexSlots; // 13
+ //uint32 MaterialID; // 14
+ //char* Texture[6]; // 15-20
+ //uint32 Color[2]; // 21-23
+ //float Unk1[18]; // 24-41
+ //uint32 Unk2[4]; // 42-45
};
#define MAX_LOCK_CASE 8
struct LockEntry
{
- uint32 ID; // 0 m_ID
- uint32 Type[MAX_LOCK_CASE]; // 1-8 m_Type
- uint32 Index[MAX_LOCK_CASE]; // 9-16 m_Index
- uint32 Skill[MAX_LOCK_CASE]; // 17-24 m_Skill
- //uint32 Action[MAX_LOCK_CASE]; // 25-32 m_Action
+ uint32 ID; // 0
+ uint32 Type[MAX_LOCK_CASE]; // 1-8
+ uint32 Index[MAX_LOCK_CASE]; // 9-16
+ uint32 Skill[MAX_LOCK_CASE]; // 17-24
+ //uint32 Action[MAX_LOCK_CASE]; // 25-32
};
struct PhaseEntry
{
- uint32 ID; // 0
- char* Name; // 1
- uint32 flag; // 2
+ uint32 ID; // 0
+ char* Name; // 1
+ uint32 Flaga; // 2
};
struct PhaseGroupEntry
{
- uint32 ID;
- uint32 PhaseId;
- uint32 GroupId;
+ uint32 ID;
+ uint32 PhaseID;
+ uint32 PhaseGroupID;
};
struct MailTemplateEntry
{
uint32 ID; // 0
- //char* subject; // 1 m_subject_lang
- char* content; // 2 m_body_lang
+ //char* Subject_lang; // 1
+ char* Body_lang; // 2
};
struct MapEntry
@@ -1577,55 +1578,50 @@ struct MapEntry
struct MapDifficultyEntry
{
- //uint32 Id; // 0
- uint32 MapId; // 1
- uint32 Difficulty; // 2 (for arenas: arena slot)
- char* areaTriggerText; // 3 m_message_lang (text showed when transfer to map failed)
- uint32 resetTime; // 4, m_raidDuration in secs, 0 if no fixed reset time
- uint32 maxPlayers; // 5, m_maxPlayers some heroic versions have 0 when expected same amount as in normal version
- //char* difficultyString; // 6 m_difficultystring
+ //uint32 ID; // 0
+ uint32 MapID; // 1
+ uint32 DifficultyID; // 2 (for arenas: arena slot)
+ char* Message_lang; // 3 m_message_lang (text showed when transfer to map failed)
+ uint32 RaidDuration; // 4 m_raidDuration in secs, 0 if no fixed reset time
+ uint32 MaxPlayers; // 5 m_maxPlayers some heroic versions have 0 when expected same amount as in normal version
+ //char* LockID; // 6
};
struct MountCapabilityEntry
{
- uint32 Id;
- uint32 Flags;
- uint32 RequiredRidingSkill;
- uint32 RequiredArea;
- uint32 RequiredAura;
- uint32 RequiredSpell;
- uint32 SpeedModSpell;
- int32 RequiredMap;
+ uint32 ID; // 0
+ uint32 Flags; // 1
+ uint32 RequiredRidingSkill; // 2
+ uint32 RequiredArea; // 3
+ uint32 RequiredAura; // 4
+ uint32 RequiredSpell; // 5
+ uint32 SpeedModSpell; // 6
+ int32 RequiredMap; // 7
};
#define MAX_MOUNT_CAPABILITIES 24
struct MountTypeEntry
{
- uint32 Id;
- uint32 MountCapability[MAX_MOUNT_CAPABILITIES];
+ uint32 ID; // 0
+ uint32 MountCapability[MAX_MOUNT_CAPABILITIES]; // 1-24
};
struct MovieEntry
{
- uint32 Id; // 0 index
- //char* filename; // 1
- //uint32 unk1; // 2 m_volume
- //uint32 unk2; // 3 4.0.0
+ uint32 ID; // 0 index
+ //uint32 Volume; // 1
+ //uint32 KeyID; // 2
+ //uint32 AudioFileDataID; // 3
+ //uint32 SubtitleFileDataID; // 4
};
struct NameGenEntry
{
- //uint32 id;
- char* name;
- uint32 race;
- uint32 gender;
-};
-
-struct NumTalentsAtLevelEntry
-{
- //uint32 Level; // 0 index
- float Talents; // 1 talent count
+ //uint32 ID; // 0
+ char* Name; // 1
+ uint32 Race; // 2
+ uint32 Sex; // 3
};
#define MAX_OVERRIDE_SPELL 10
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 75cf0c4b2e5..d01d33ac685 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -97,16 +97,16 @@ char const ItemRandomPropertiesfmt[] = "nxiiiiis";
char const ItemRandomSuffixfmt[] = "nsxiiiiiiiiii";
char const ItemSetEntryfmt[] = "nsiiiiiiiiiiiiiiiiiii";
char const ItemSetSpellEntryfmt[] = "niiii";
-char const LFGDungeonEntryfmt[] = "nsiiiiiiiiixxixixixxx";
-char const LightEntryfmt[] = "nifffxxxxxxxxxx";
-char const LiquidTypefmt[] = "nxxixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+char const LFGDungeonEntryfmt[] = "nsiiixxiiiixxixixxxxxxxxxx";
+char const LightEntryfmt[] = "nifffxxxxxxxxxxxxx";
+char const LiquidTypefmt[] = "nxxixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
char const LockEntryfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx";
char const PhaseEntryfmt[] = "nsi";
char const PhaseGroupfmt[] = "nii";
char const MailTemplateEntryfmt[] = "nxs";
char const MapEntryfmt[] = "nxiixxsixxixiffxiiiixx";
char const MapDifficultyEntryfmt[] = "diisiix";
-char const MovieEntryfmt[] = "nxxx";
+char const MovieEntryfmt[] = "nxxxx";
char const MountCapabilityfmt[] = "niiiiiii";
char const MountTypefmt[] = "niiiiiiiiiiiiiiiiiiiiiiii";
char const NameGenfmt[] = "dsii";
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 3272c29a447..8651b1ff8a5 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -182,7 +182,7 @@ void LFGMgr::LoadLFGDungeons(bool reload /* = false */)
if (!dungeon)
continue;
- switch (dungeon->type)
+ switch (dungeon->Type)
{
case LFG_TYPE_DUNGEON:
case LFG_TYPE_HEROIC:
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index 9f990131a71..03452caeabd 100644
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -271,10 +271,10 @@ struct LFGDungeonData
maxlevel(0), difficulty(REGULAR_DIFFICULTY), seasonal(false), x(0.0f), y(0.0f), z(0.0f), o(0.0f),
requiredItemLevel(0)
{ }
- LFGDungeonData(LFGDungeonEntry const* dbc): id(dbc->ID), name(dbc->name), map(dbc->map),
- type(dbc->type), expansion(dbc->expansion), group(dbc->grouptype),
- minlevel(dbc->minlevel), maxlevel(dbc->maxlevel), difficulty(Difficulty(dbc->difficulty)),
- seasonal((dbc->flags & LFG_FLAG_SEASONAL) != 0), x(0.0f), y(0.0f), z(0.0f), o(0.0f),
+ LFGDungeonData(LFGDungeonEntry const* dbc): id(dbc->ID), name(dbc->Name_lang), map(dbc->MapID),
+ type(dbc->Type), expansion(dbc->Expansion), group(dbc->GroupID),
+ minlevel(dbc->MinLevel), maxlevel(dbc->MaxLevel), difficulty(Difficulty(dbc->DifficultyID)),
+ seasonal((dbc->Flags & LFG_FLAG_SEASONAL) != 0), x(0.0f), y(0.0f), z(0.0f), o(0.0f),
requiredItemLevel(0)
{ }
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 47f6906ef78..b01b602449e 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1429,7 +1429,7 @@ void Player::HandleDrowning(uint32 time_diff)
SendMirrorTimer(FATIGUE_TIMER, DarkWaterTime, m_MirrorTimer[FATIGUE_TIMER], 10);
}
- if (m_MirrorTimerFlags & (UNDERWATER_INLAVA /*| UNDERWATER_INSLIME*/) && !(_lastLiquid && _lastLiquid->SpellId))
+ if (m_MirrorTimerFlags & (UNDERWATER_INLAVA /*| UNDERWATER_INSLIME*/) && !(_lastLiquid && _lastLiquid->SpellID))
{
// Breath timer not activated - activate it
if (m_MirrorTimer[FIRE_TIMER] == DISABLED_MIRROR_TIMER)
@@ -6748,7 +6748,7 @@ void Player::RewardReputation(Unit* victim, float rate)
Map const* map = GetMap();
if (map && map->IsNonRaidDungeon())
if (LFGDungeonEntry const* dungeon = GetLFGDungeon(map->GetId(), map->GetDifficulty()))
- if (dungeon->reclevel == 80)
+ if (dungeon->TargetLevel == 80)
ChampioningFaction = GetChampioningFaction();
}
@@ -24695,8 +24695,8 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z)
if (!res)
{
m_MirrorTimerFlags &= ~(UNDERWATER_INWATER | UNDERWATER_INLAVA | UNDERWATER_INSLIME | UNDERWARER_INDARKWATER);
- if (_lastLiquid && _lastLiquid->SpellId)
- RemoveAurasDueToSpell(_lastLiquid->SpellId);
+ if (_lastLiquid && _lastLiquid->SpellID)
+ RemoveAurasDueToSpell(_lastLiquid->SpellID);
_lastLiquid = NULL;
return;
@@ -24705,25 +24705,25 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z)
if (uint32 liqEntry = liquid_status.entry)
{
LiquidTypeEntry const* liquid = sLiquidTypeStore.LookupEntry(liqEntry);
- if (_lastLiquid && _lastLiquid->SpellId && _lastLiquid->Id != liqEntry)
- RemoveAurasDueToSpell(_lastLiquid->SpellId);
+ if (_lastLiquid && _lastLiquid->SpellID && _lastLiquid->ID != liqEntry)
+ RemoveAurasDueToSpell(_lastLiquid->SpellID);
- if (liquid && liquid->SpellId)
+ if (liquid && liquid->SpellID)
{
if (res & (LIQUID_MAP_UNDER_WATER | LIQUID_MAP_IN_WATER))
{
- if (!HasAura(liquid->SpellId))
- CastSpell(this, liquid->SpellId, true);
+ if (!HasAura(liquid->SpellID))
+ CastSpell(this, liquid->SpellID, true);
}
else
- RemoveAurasDueToSpell(liquid->SpellId);
+ RemoveAurasDueToSpell(liquid->SpellID);
}
_lastLiquid = liquid;
}
- else if (_lastLiquid && _lastLiquid->SpellId)
+ else if (_lastLiquid && _lastLiquid->SpellID)
{
- RemoveAurasDueToSpell(_lastLiquid->SpellId);
+ RemoveAurasDueToSpell(_lastLiquid->SpellID);
_lastLiquid = NULL;
}
@@ -25310,10 +25310,11 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot)
SendEquipError(msg, NULL, NULL, item->itemid);
}
+// 6.x - removeme
uint32 Player::CalculateTalentsPoints() const
{
// this dbc file has entries only up to level 100
- NumTalentsAtLevelEntry const* count = sNumTalentsAtLevelStore.LookupEntry(std::min<uint32>(getLevel(), 100));
+ /*NumTalentsAtLevelEntry const* count = sNumTalentsAtLevelStore.LookupEntry(std::min<uint32>(getLevel(), 100));
if (!count)
return 0;
@@ -25337,7 +25338,8 @@ uint32 Player::CalculateTalentsPoints() const
if (talentPointsForLevel > baseForLevel)
talentPointsForLevel = baseForLevel;
- return uint32(talentPointsForLevel * sWorld->getRate(RATE_TALENT));
+ return uint32(talentPointsForLevel * sWorld->getRate(RATE_TALENT));*/
+ return 0;
}
bool Player::IsKnowHowFlyIn(uint32 mapid, uint32 zone) const
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 786595c5077..043c0581ac4 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -2949,8 +2949,8 @@ void Unit::UpdateUnderwaterState(Map* m, float x, float y, float z)
ZLiquidStatus res = m->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &liquid_status);
if (!res)
{
- if (_lastLiquid && _lastLiquid->SpellId)
- RemoveAurasDueToSpell(_lastLiquid->SpellId);
+ if (_lastLiquid && _lastLiquid->SpellID)
+ RemoveAurasDueToSpell(_lastLiquid->SpellID);
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_UNDERWATER);
_lastLiquid = NULL;
@@ -2960,26 +2960,26 @@ void Unit::UpdateUnderwaterState(Map* m, float x, float y, float z)
if (uint32 liqEntry = liquid_status.entry)
{
LiquidTypeEntry const* liquid = sLiquidTypeStore.LookupEntry(liqEntry);
- if (_lastLiquid && _lastLiquid->SpellId && _lastLiquid->Id != liqEntry)
- RemoveAurasDueToSpell(_lastLiquid->SpellId);
+ if (_lastLiquid && _lastLiquid->SpellID && _lastLiquid->ID != liqEntry)
+ RemoveAurasDueToSpell(_lastLiquid->SpellID);
- if (liquid && liquid->SpellId)
+ if (liquid && liquid->SpellID)
{
if (res & (LIQUID_MAP_UNDER_WATER | LIQUID_MAP_IN_WATER))
{
- if (!HasAura(liquid->SpellId))
- CastSpell(this, liquid->SpellId, true);
+ if (!HasAura(liquid->SpellID))
+ CastSpell(this, liquid->SpellID, true);
}
else
- RemoveAurasDueToSpell(liquid->SpellId);
+ RemoveAurasDueToSpell(liquid->SpellID);
}
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_ABOVEWATER);
_lastLiquid = liquid;
}
- else if (_lastLiquid && _lastLiquid->SpellId)
+ else if (_lastLiquid && _lastLiquid->SpellID)
{
- RemoveAurasDueToSpell(_lastLiquid->SpellId);
+ RemoveAurasDueToSpell(_lastLiquid->SpellID);
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_UNDERWATER);
_lastLiquid = NULL;
}
diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp
index ce7cdad7247..44c51800c57 100644
--- a/src/server/game/Handlers/MailHandler.cpp
+++ b/src/server/game/Handlers/MailHandler.cpp
@@ -810,7 +810,7 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket& recvData)
return;
}
- bodyItem->SetText(mailTemplateEntry->content);
+ bodyItem->SetText(mailTemplateEntry->Body_lang);
}
else
bodyItem->SetText(m->body);
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 8e8885e7000..16a8f110a15 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2038,7 +2038,7 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R
{
if (LiquidTypeEntry const* liquidEntry = sLiquidTypeStore.LookupEntry(_liquidEntry[idx]))
{
- entry = liquidEntry->Id;
+ entry = liquidEntry->ID;
type &= MAP_LIQUID_TYPE_DARK_WATER;
uint32 liqTypeIdx = liquidEntry->Type;
if (entry < 21)
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 1142240a3af..c8fbbcbec53 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -557,7 +557,7 @@ int32 AuraEffect::CalculateAmount(Unit* caster)
case SPELL_AURA_MOUNTED:
if (MountCapabilityEntry const* mountCapability = GetBase()->GetUnitOwner()->GetMountCapability(uint32(GetMiscValueB())))
{
- amount = mountCapability->Id;
+ amount = mountCapability->ID;
m_canBeRecalculated = false;
}
break;