Skip to content

Add Cataclysm DBC compatibility guards #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MadMaxMangos merged 2 commits into from
Jul 15, 2026
Merged

Add Cataclysm DBC compatibility guards #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
875e889
refactor(dbc): add Cata shared-field guards
MadMaxMangos Jul 15, 2026
735b67e
refactor(dbc): add Cata spell-family guards
MadMaxMangos Jul 15, 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
4 changes: 4 additions & 0 deletions hooks/CreatureHooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@ bool Eluna::SpellHit(Creature* me, WorldObject* caster, SpellInfo const* spell)
HookPush(caster);
#if defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_CLASSIC || ELUNA_EXPANSION == EXP_TBC || ELUNA_EXPANSION == EXP_WOTLK || ELUNA_EXPANSION == EXP_MISTS)
HookPush(spell->ID); // Pass spell object?
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
HookPush(spell->ID); // Pass spell object?
#else
HookPush(spell->Id); // Pass spell object?
#endif
Expand All @@ -301,6 +303,8 @@ bool Eluna::SpellHitTarget(Creature* me, WorldObject* target, SpellInfo const* s
HookPush(target);
#if defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_CLASSIC || ELUNA_EXPANSION == EXP_TBC || ELUNA_EXPANSION == EXP_WOTLK || ELUNA_EXPANSION == EXP_MISTS)
HookPush(spell->ID); // Pass spell object?
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
HookPush(spell->ID); // Pass spell object?
#else
HookPush(spell->Id); // Pass spell object?
#endif
Expand Down
2 changes: 2 additions & 0 deletions hooks/ServerHooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ bool Eluna::OnAreaTrigger(Player* pPlayer, AreaTriggerEntry const* pTrigger)
HookPush(pTrigger->entry);
#elif defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_CLASSIC || ELUNA_EXPANSION == EXP_WOTLK)
HookPush(pTrigger->ID);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
HookPush(pTrigger->ID);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
HookPush(pTrigger->ID);
#else
Expand Down
22 changes: 22 additions & 0 deletions methods/Mangos/GlobalMethods.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,8 @@ namespace LuaGlobalFunctions

#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_TBC || ELUNA_EXPANSION == EXP_WOTLK))
E->Push(areaEntry->AreaName_lang[locale]);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
E->Push(areaEntry->AreaName_lang[locale]);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
E->Push(areaEntry->AreaName_lang[locale]);
#else
Expand Down Expand Up @@ -2094,6 +2096,11 @@ namespace LuaGlobalFunctions
entry.LocX = E->CHECKVAL<float>(start + 1);
entry.LocY = E->CHECKVAL<float>(start + 2);
entry.LocZ = E->CHECKVAL<float>(start + 3);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
entry.ContinentID = E->CHECKVAL<uint32>(start);
entry.Loc_0 = E->CHECKVAL<float>(start + 1);
entry.Loc_1 = E->CHECKVAL<float>(start + 2);
entry.Loc_2 = E->CHECKVAL<float>(start + 3);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
entry.ContinentID = E->CHECKVAL<uint32>(start);
entry.x = E->CHECKVAL<float>(start + 1);
Expand All @@ -2109,6 +2116,9 @@ namespace LuaGlobalFunctions
#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_TBC || ELUNA_EXPANSION == EXP_WOTLK))
entry.Flags = E->CHECKVAL<uint32>(start + 4, 0);
entry.Delay = E->CHECKVAL<uint32>(start + 5, 0);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
entry.Flags = E->CHECKVAL<uint32>(start + 4, 0);
entry.Delay = E->CHECKVAL<uint32>(start + 5, 0);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
entry.Flags = E->CHECKVAL<uint32>(start + 4, 0);
entry.Delay = E->CHECKVAL<uint32>(start + 5, 0);
Expand Down Expand Up @@ -2159,6 +2169,14 @@ namespace LuaGlobalFunctions
nodeEntry->x = entry.LocX;
nodeEntry->y = entry.LocY;
nodeEntry->z = entry.LocZ;
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
entry.PathID = pathId;
entry.NodeIndex = nodeId;
nodeEntry->ID = index;
nodeEntry->ContinentID = entry.ContinentID;
nodeEntry->Pos_0 = entry.Loc_0;
nodeEntry->Pos_1 = entry.Loc_1;
nodeEntry->Pos_2 = entry.Loc_2;
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
entry.PathID = pathId;
entry.NodeIndex = nodeId;
Expand Down Expand Up @@ -2191,6 +2209,10 @@ namespace LuaGlobalFunctions
pathEntry->FromTaxiNode = startNode;
pathEntry->ToTaxiNode = nodeId - 1;
pathEntry->Cost = price;
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
pathEntry->FromTaxiNode = startNode;
pathEntry->ToTaxiNode = nodeId - 1;
pathEntry->Cost = price;
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
pathEntry->FromTaxiNode = startNode;
pathEntry->ToTaxiNode = nodeId - 1;
Expand Down
4 changes: 4 additions & 0 deletions methods/Mangos/ItemMethods.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ namespace LuaItem
if (itemRandEntry)
#if defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_TBC || ELUNA_EXPANSION == EXP_WOTLK)
suffix = itemRandEntry->Name_lang;
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
suffix = itemRandEntry->Name_lang;
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
suffix = itemRandEntry->Name_lang;
#else
Expand All @@ -285,6 +287,8 @@ namespace LuaItem
if (itemRandEntry)
#if defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_TBC || ELUNA_EXPANSION == EXP_WOTLK)
suffix = itemRandEntry->Name_lang;
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
suffix = itemRandEntry->Name_lang;
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
suffix = itemRandEntry->Name_lang;
#else
Expand Down
8 changes: 8 additions & 0 deletions methods/Mangos/PlayerMethods.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2080,6 +2080,8 @@ namespace LuaPlayer
data << unit->GET_GUID();
#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_TBC
data << uint32(ahEntry->ID);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
data << uint32(ahEntry->ID);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
data << uint32(ahEntry->ID);
#else
Expand Down Expand Up @@ -2988,6 +2990,12 @@ namespace LuaPlayer
if (entry->CategoryID == SKILL_CATEGORY_LANGUAGES || entry->CategoryID == SKILL_CATEGORY_GENERIC)
continue;

if (player->HasSkill(entry->ID))
player->UpdateSkill(entry->ID, step);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
if (entry->CategoryID == SKILL_CATEGORY_LANGUAGES || entry->CategoryID == SKILL_CATEGORY_GENERIC)
continue;

if (player->HasSkill(entry->ID))
player->UpdateSkill(entry->ID, step);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
Expand Down
2 changes: 2 additions & 0 deletions methods/Mangos/SpellMethods.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ namespace LuaSpell
{
#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_TBC || ELUNA_EXPANSION == EXP_WOTLK))
E->Push(spell->m_spellInfo->ID);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
E->Push(spell->m_spellInfo->ID);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
E->Push(spell->m_spellInfo->ID);
#else
Expand Down
4 changes: 4 additions & 0 deletions methods/Mangos/UnitMethods.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,6 +950,8 @@ namespace LuaUnit

#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_TBC || ELUNA_EXPANSION == EXP_WOTLK))
E->Push(entry->Name_lang[locale]);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
E->Push(entry->Name_lang[locale]);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
E->Push(entry->Name_lang[locale]);
#else
Expand Down Expand Up @@ -991,6 +993,8 @@ namespace LuaUnit

#if ELUNA_EXPANSION == EXP_CLASSIC || (defined(ELUNA_MANGOS) && (ELUNA_EXPANSION == EXP_TBC || ELUNA_EXPANSION == EXP_WOTLK))
E->Push(entry->Name_lang[locale]);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
E->Push(entry->Name_lang[locale]);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
E->Push(entry->Name_lang[locale]);
#else
Expand Down
2 changes: 2 additions & 0 deletions methods/Mangos/VehicleMethods.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ namespace LuaVehicle
{
#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_WOTLK
E->Push(vehicle->GetVehicleEntry()->ID);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_CATA
E->Push(vehicle->GetVehicleEntry()->ID);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
E->Push(vehicle->GetVehicleEntry()->ID);
#else
Expand Down
Loading