Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
394c31f
CharStartOutfit: faithful DBC layout (4x uint8 identity, bbbb fmt, co…
MadMaxMangos Jul 3, 2026
53d6237
SpellRadius: document server-unused DBC fields (comment-but-correct)
MadMaxMangos Jul 3, 2026
d089454
Emotes: document server-unused DBC fields (comment-but-correct)
MadMaxMangos Jul 3, 2026
256d94b
Lock: document server-unused DBC fields (comment-but-correct)
MadMaxMangos Jul 3, 2026
c671071
AuctionHouse: document server-unused DBC fields (comment-but-correct)
MadMaxMangos Jul 3, 2026
86610a6
ItemBagFamily: document server-unused DBC fields (comment-but-correct)
MadMaxMangos Jul 3, 2026
f198202
MailTemplate: document server-unused DBC fields (comment-but-correct)
MadMaxMangos Jul 3, 2026
4518795
SpellFocusObject: document server-unused DBC fields (comment-but-corr…
MadMaxMangos Jul 3, 2026
c725b2b
WorldSafeLocs: document server-unused DBC fields (comment-but-correct)
MadMaxMangos Jul 3, 2026
f60c92f
CreatureType: document server-unused DBC fields (comment-but-correct)
MadMaxMangos Jul 3, 2026
5d8f660
CreatureDisplayInfoExtra: document server-unused DBC fields (comment-…
MadMaxMangos Jul 3, 2026
1284e67
SoundEntries: document server-unused DBC fields (comment-but-correct)
MadMaxMangos Jul 3, 2026
62d318a
DBC align Batch 2: 11 tables (renames + doc-unused) + consumers
MadMaxMangos Jul 3, 2026
676d706
DBC align Batch 3: 11 tables (28 renames + doc-unused) + consumers
MadMaxMangos Jul 3, 2026
11394a8
DBC align Batch 4: 11 tables (66 renames + doc-unused) + consumers
MadMaxMangos Jul 3, 2026
d4888f2
DBC align Batch 5: AreaTable + SkillLineAbility (19 renames + doc-unu…
MadMaxMangos Jul 3, 2026
0b86e85
LiquidType: field 1 is the Name string, not an int (fmt i->s, char* N…
MadMaxMangos Jul 6, 2026
acdb492
Spell: rename SpellEntry fields to build-exact 1.12 .dbd names + doc …
MadMaxMangos Jul 6, 2026
5830473
Spell: fix SpellEntry consumers for .dbd rename (align)
MadMaxMangos Jul 6, 2026
6ab8e67
Spell: bump SD3/Eluna to expansion-guarded accessors (cross-fork safe)
MadMaxMangos Jul 6, 2026
3eb9057
AreaTrigger + SpellRange: bump SD3 pointer to guarded accessors (cros…
MadMaxMangos Jul 6, 2026
903e2b3
Cross-fork: bump Eluna pointer to guarded Batch 3-5 consumer renames
MadMaxMangos Jul 6, 2026
2f34bca
fix(sd3): bump pointer to cross-core GetPowerType() fix (7d62a5b)
MadMaxMangos Jul 6, 2026
385967d
Merge origin/master into enhance/dbc (sync DBC-alignment branch)
MadMaxMangos Jul 6, 2026
2e92aa8
Rename SpellEntry consumers in merged-in SpellCooldownMgr (Id->ID)
MadMaxMangos Jul 6, 2026
dc342e8
Point SD3/Eluna submodules at squash-merged master commits
MadMaxMangos Jul 6, 2026
7c76006
docs(dbc): reference structs for the 103 unmodelled client DBCs (comp…
MadMaxMangos Jul 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/game/AuctionHouseBot/AuctionHouseBot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ bool AuctionBotConfig::Reload()
char const* AuctionBotConfig::GetItemClassName(ItemClass itemclass)
{
ItemClassEntry const* itemClassEntry = sItemClassStore.LookupEntry(itemclass);
return itemClassEntry ? itemClassEntry->name[sWorld.GetDefaultDbcLocale()] : "";
return itemClassEntry ? itemClassEntry->ClassName_lang[sWorld.GetDefaultDbcLocale()] : "";
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/game/BattleGround/BattleGroundMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()

if (MapEntry const* mapEntry = sMapStore.LookupEntry(mapId))
{
name = mapEntry->name[sWorld.GetDefaultDbcLocale()];
name = mapEntry->MapName_lang[sWorld.GetDefaultDbcLocale()];
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions src/game/ChatCommands/CastAndAuraCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ bool ChatHandler::HandleCastCommand(char* args)
{
target->CastSpell(target, spell, true);
PSendSysMessage("Cast spell %u (%s) on %s",
spell, spellInfo->SpellName[GetSessionDbcLocale()],
spell, spellInfo->Name_lang[GetSessionDbcLocale()],
target->GetName());
return true;
}
Expand Down Expand Up @@ -422,7 +422,7 @@ bool ChatHandler::HandleAuraGroupCommand(char* args)
else
{
AddAuraToPlayer(spellInfo, playerTarget, m_session->GetPlayer());
PSendSysMessage(LANG_COMMAND_AURAGROUP_AURA_APPLIED, spellInfo->Id, nameLink.c_str());
PSendSysMessage(LANG_COMMAND_AURAGROUP_AURA_APPLIED, spellInfo->ID, nameLink.c_str());
return true;
}
}
Expand All @@ -449,7 +449,7 @@ bool ChatHandler::HandleAuraGroupCommand(char* args)
}

AddAuraToPlayer(spellInfo, pl, m_session->GetPlayer());
PSendSysMessage(LANG_COMMAND_AURAGROUP_AURA_APPLIED, spellInfo->Id, nameLink.c_str());
PSendSysMessage(LANG_COMMAND_AURAGROUP_AURA_APPLIED, spellInfo->ID, nameLink.c_str());

}

Expand Down
4 changes: 2 additions & 2 deletions src/game/ChatCommands/DebugCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ bool ChatHandler::HandleDebugSpellCoefsCommand(char* args)
{
// Heals (Also count Mana Shield and Absorb effects as heals)
if (spellEntry->Effect[i] == SPELL_EFFECT_HEAL || spellEntry->Effect[i] == SPELL_EFFECT_HEAL_MAX_HEALTH ||
(spellEntry->Effect[i] == SPELL_EFFECT_APPLY_AURA && (spellEntry->EffectApplyAuraName[i] == SPELL_AURA_SCHOOL_ABSORB || spellEntry->EffectApplyAuraName[i] == SPELL_AURA_PERIODIC_HEAL)))
(spellEntry->Effect[i] == SPELL_EFFECT_APPLY_AURA && (spellEntry->EffectAura[i] == SPELL_AURA_SCHOOL_ABSORB || spellEntry->EffectAura[i] == SPELL_AURA_PERIODIC_HEAL)))
{
isDirectHeal = true;
break;
Expand All @@ -1581,7 +1581,7 @@ bool ChatHandler::HandleDebugSpellCoefsCommand(char* args)
for (int i = 0; i < 3; ++i)
{
// Periodic Heals
if (spellEntry->Effect[i] == SPELL_EFFECT_APPLY_AURA && spellEntry->EffectApplyAuraName[i] == SPELL_AURA_PERIODIC_HEAL)
if (spellEntry->Effect[i] == SPELL_EFFECT_APPLY_AURA && spellEntry->EffectAura[i] == SPELL_AURA_PERIODIC_HEAL)
{
isDotHeal = true;
break;
Expand Down
18 changes: 9 additions & 9 deletions src/game/ChatCommands/GMCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ bool ChatHandler::HandlePInfoCommand(char* args)

ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(race);
ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(class_);
char const* race_name = raceEntry ? raceEntry->name[GetSessionDbcLocale()] : "<unknown>";
char const* class_name = classEntry ? classEntry->name[GetSessionDbcLocale()] : "<unknown>";
char const* race_name = raceEntry ? raceEntry->Name_lang[GetSessionDbcLocale()] : "<unknown>";
char const* class_name = classEntry ? classEntry->Name_lang[GetSessionDbcLocale()] : "<unknown>";
//PSendSysMessage(LANG_PINFO_RACE_CLASS, race_name, class_name);
PSendSysMessage("Race: %s, Class: %s", race_name, class_name);

Expand All @@ -172,9 +172,9 @@ bool ChatHandler::HandlePInfoCommand(char* args)

PSendSysMessage("Location: Map %u (%s), Zone %u (%s)",
mapId,
(mapEntry ? mapEntry->name[GetSessionDbcLocale()] : "<unknown>"),
(mapEntry ? mapEntry->MapName_lang[GetSessionDbcLocale()] : "<unknown>"),
zoneId,
(zoneEntry ? zoneEntry->area_name[GetSessionDbcLocale()] : "<unknown>"));
(zoneEntry ? zoneEntry->AreaName_lang[GetSessionDbcLocale()] : "<unknown>"));

PSendSysMessage("Coordinates: X=%.2f Y=%.2f Z=%.2f O=%.2f",
posX, posY, posZ, orientation);
Expand All @@ -198,7 +198,7 @@ bool ChatHandler::HandlePInfoCommand(char* args)
{
continue;
}
std::string name = sl->name[loc];
std::string name = sl->DisplayName_lang[loc];
if (name.empty())
{
int fallbackLoc = 0;
Expand All @@ -208,7 +208,7 @@ bool ChatHandler::HandlePInfoCommand(char* args)
{
continue;
}
name = sl->name[fallbackLoc];
name = sl->DisplayName_lang[fallbackLoc];
if (!name.empty())
{
break;
Expand Down Expand Up @@ -247,7 +247,7 @@ bool ChatHandler::HandlePInfoCommand(char* args)
{
continue;
}
std::string name = sl->name[loc];
std::string name = sl->DisplayName_lang[loc];
if (name.empty())
{
int fallbackLoc = 0;
Expand All @@ -257,7 +257,7 @@ bool ChatHandler::HandlePInfoCommand(char* args)
{
continue;
}
name = sl->name[fallbackLoc];
name = sl->DisplayName_lang[fallbackLoc];
if (!name.empty())
{
break;
Expand Down Expand Up @@ -419,7 +419,7 @@ bool ChatHandler::HandleGMVisibleCommand(char* args)
m_session->SendNotification(LANG_INVISIBLE_VISIBLE);
if (invisibleAuraInfo)
{
player->RemoveAurasDueToSpell(invisibleAuraInfo->Id);
player->RemoveAurasDueToSpell(invisibleAuraInfo->ID);
}
}
else
Expand Down
6 changes: 3 additions & 3 deletions src/game/ChatCommands/InstanceCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ bool ChatHandler::HandleInstanceListBindsCommand(char* /*args*/)
if (const MapEntry* entry = sMapStore.LookupEntry(itr->first))
{
PSendSysMessage("map: %d (%s) inst: %d perm: %s canReset: %s TTR: %s",
itr->first, entry->name[GetSessionDbcLocale()], state->GetInstanceId(), itr->second.perm ? "yes" : "no",
itr->first, entry->MapName_lang[GetSessionDbcLocale()], state->GetInstanceId(), itr->second.perm ? "yes" : "no",
state->CanReset() ? "yes" : "no", timeleft.c_str());
}
else
Expand All @@ -84,7 +84,7 @@ bool ChatHandler::HandleInstanceListBindsCommand(char* /*args*/)
if (const MapEntry* entry = sMapStore.LookupEntry(itr->first))
{
PSendSysMessage("map: %d (%s) inst: %d perm: %s canReset: %s TTR: %s",
itr->first, entry->name[GetSessionDbcLocale()], state->GetInstanceId(), itr->second.perm ? "yes" : "no",
itr->first, entry->MapName_lang[GetSessionDbcLocale()], state->GetInstanceId(), itr->second.perm ? "yes" : "no",
state->CanReset() ? "yes" : "no", timeleft.c_str());
}
else
Expand Down Expand Up @@ -148,7 +148,7 @@ bool ChatHandler::HandleInstanceUnbindCommand(char* args)
if (const MapEntry* entry = sMapStore.LookupEntry(itr->first))
{
PSendSysMessage("unbinding map: %d (%s) inst: %d perm: %s canReset: %s TTR: %s",
itr->first, entry->name[GetSessionDbcLocale()], save->GetInstanceId(), itr->second.perm ? "yes" : "no",
itr->first, entry->MapName_lang[GetSessionDbcLocale()], save->GetInstanceId(), itr->second.perm ? "yes" : "no",
save->CanReset() ? "yes" : "no", timeleft.c_str());
}
else
Expand Down
6 changes: 3 additions & 3 deletions src/game/ChatCommands/ListCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ bool ChatHandler::HandleListAurasCommand(char* /*args*/)
bool talent = GetTalentSpellCost(itr->second->GetId()) > 0;

SpellAuraHolder* holder = itr->second;
char const* name = holder->GetSpellProto()->SpellName[GetSessionDbcLocale()];
char const* name = holder->GetSpellProto()->Name_lang[GetSessionDbcLocale()];

for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
{
Expand Down Expand Up @@ -106,7 +106,7 @@ bool ChatHandler::HandleListAurasCommand(char* /*args*/)
{
bool talent = GetTalentSpellCost((*itr)->GetId()) > 0;

char const* name = (*itr)->GetSpellProto()->SpellName[GetSessionDbcLocale()];
char const* name = (*itr)->GetSpellProto()->Name_lang[GetSessionDbcLocale()];

if (m_session)
{
Expand Down Expand Up @@ -426,7 +426,7 @@ bool ChatHandler::HandleListPlayersCommand(char* args)
player->getLevel(),
mapId,
zoneId,
(zoneEntry ? zoneEntry->area_name[GetSessionDbcLocale()] : "Unknown"));
(zoneEntry ? zoneEntry->AreaName_lang[GetSessionDbcLocale()] : "Unknown"));

count++;
});
Expand Down
24 changes: 12 additions & 12 deletions src/game/ChatCommands/LookupCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ bool ChatHandler::HandleLookupAreaCommand(char* args)
if (areaEntry)
{
int loc = GetSessionDbcLocale();
std::string name = areaEntry->area_name[loc];
std::string name = areaEntry->AreaName_lang[loc];
if (name.empty())
{
continue;
Expand All @@ -242,7 +242,7 @@ bool ChatHandler::HandleLookupAreaCommand(char* args)
continue;
}

name = areaEntry->area_name[loc];
name = areaEntry->AreaName_lang[loc];
if (name.empty())
{
continue;
Expand Down Expand Up @@ -371,7 +371,7 @@ bool ChatHandler::HandleLookupFactionCommand(char* args)
if (factionEntry)
{
int loc = GetSessionDbcLocale();
std::string name = factionEntry->name[loc];
std::string name = factionEntry->Name_lang[loc];
if (name.empty())
{
continue;
Expand All @@ -387,7 +387,7 @@ bool ChatHandler::HandleLookupFactionCommand(char* args)
continue;
}

name = factionEntry->name[loc];
name = factionEntry->Name_lang[loc];
if (name.empty())
{
continue;
Expand Down Expand Up @@ -865,7 +865,7 @@ bool ChatHandler::HandleLookupItemSetCommand(char* args)
if (set)
{
int loc = GetSessionDbcLocale();
std::string name = set->name[loc];
std::string name = set->Name_lang[loc];
if (name.empty())
{
continue;
Expand All @@ -881,7 +881,7 @@ bool ChatHandler::HandleLookupItemSetCommand(char* args)
continue;
}

name = set->name[loc];
name = set->Name_lang[loc];
if (name.empty())
{
continue;
Expand Down Expand Up @@ -952,7 +952,7 @@ bool ChatHandler::HandleLookupSkillCommand(char* args)
if (skillInfo)
{
int loc = GetSessionDbcLocale();
std::string name = skillInfo->name[loc];
std::string name = skillInfo->DisplayName_lang[loc];
if (name.empty())
{
continue;
Expand All @@ -968,7 +968,7 @@ bool ChatHandler::HandleLookupSkillCommand(char* args)
continue;
}

name = skillInfo->name[loc];
name = skillInfo->DisplayName_lang[loc];
if (name.empty())
{
continue;
Expand Down Expand Up @@ -1054,7 +1054,7 @@ bool ChatHandler::HandleLookupSpellCommand(char* args)
if (spellInfo)
{
int loc = GetSessionDbcLocale();
std::string name = spellInfo->SpellName[loc];
std::string name = spellInfo->Name_lang[loc];
if (name.empty())
{
continue;
Expand All @@ -1070,7 +1070,7 @@ bool ChatHandler::HandleLookupSpellCommand(char* args)
continue;
}

name = spellInfo->SpellName[loc];
name = spellInfo->Name_lang[loc];
if (name.empty())
{
continue;
Expand Down Expand Up @@ -1336,7 +1336,7 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(char* args)
if (nodeEntry)
{
int loc = GetSessionDbcLocale();
std::string name = nodeEntry->name[loc];
std::string name = nodeEntry->Name_lang[loc];
if (name.empty())
{
continue;
Expand All @@ -1352,7 +1352,7 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(char* args)
continue;
}

name = nodeEntry->name[loc];
name = nodeEntry->Name_lang[loc];
if (name.empty())
{
continue;
Expand Down
12 changes: 6 additions & 6 deletions src/game/ChatCommands/PlayerCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ bool ChatHandler::HandleLinkGraveCommand(char* args)
uint32 zoneId = player->GetZoneId();

AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(zoneId);
if (!areaEntry || areaEntry->zone != 0)
if (!areaEntry || areaEntry->ParentAreaID != 0)
{
PSendSysMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, g_id, zoneId);
SetSentErrorMessage(true);
Expand Down Expand Up @@ -1439,7 +1439,7 @@ bool ChatHandler::HandleSetSkillCommand(char* args)

if (!target->GetSkillValue(skill))
{
PSendSysMessage(LANG_SET_SKILL_ERROR, tNameLink.c_str(), skill, sl->name[GetSessionDbcLocale()]);
PSendSysMessage(LANG_SET_SKILL_ERROR, tNameLink.c_str(), skill, sl->DisplayName_lang[GetSessionDbcLocale()]);
SetSentErrorMessage(true);
return false;
}
Expand All @@ -1450,7 +1450,7 @@ bool ChatHandler::HandleSetSkillCommand(char* args)
}

target->SetSkill(skill, level, maxskill);
PSendSysMessage(LANG_SET_SKILL, skill, sl->name[GetSessionDbcLocale()], tNameLink.c_str(), level, maxskill);
PSendSysMessage(LANG_SET_SKILL, skill, sl->DisplayName_lang[GetSessionDbcLocale()], tNameLink.c_str(), level, maxskill);

return true;
}
Expand Down Expand Up @@ -2527,15 +2527,15 @@ bool ChatHandler::HandleModifyRepCommand(char* args)
return false;
}

if (factionEntry->reputationListID < 0)
if (factionEntry->ReputationIndex < 0)
{
PSendSysMessage(LANG_COMMAND_FACTION_NOREP_ERROR, factionEntry->name[GetSessionDbcLocale()], factionId);
PSendSysMessage(LANG_COMMAND_FACTION_NOREP_ERROR, factionEntry->Name_lang[GetSessionDbcLocale()], factionId);
SetSentErrorMessage(true);
return false;
}

target->GetReputationMgr().SetReputation(factionEntry, amount);
PSendSysMessage(LANG_COMMAND_MODIFY_REP, factionEntry->name[GetSessionDbcLocale()], factionId,
PSendSysMessage(LANG_COMMAND_MODIFY_REP, factionEntry->Name_lang[GetSessionDbcLocale()], factionId,
GetNameLink(target).c_str(), target->GetReputationMgr().GetReputation(factionEntry));
return true;
}
Expand Down
Loading
Loading