Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 methods/Mangos/GroupMethods.h
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,10 @@ namespace LuaGroup

#if (defined(CLASSIC) || defined(TBC))
group->SetTargetIcon(icon, target);
#elif defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
// MoP (mangos-four) restored raid markers with a fourth "context" argument on
// Group::SetTargetIcon; 0 selects a normal target-icon set (see GroupHandler).
group->SetTargetIcon(icon, setter, target, 0);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep MoP SetTargetIcon at three arguments

When building against the mangos-four 0.17 / 18414 core, Group::SetTargetIcon is declared and called by GroupHandler with three parameters (uint8, ObjectGuid, ObjectGuid), so this MoP-only four-argument call has no matching overload and prevents the supported MoP target from compiling. Please keep the MoP branch on the existing (icon, setter, target) call unless it is guarded for a core revision that actually has the context parameter.

Useful? React with 👍 / 👎.

#else
group->SetTargetIcon(icon, setter, target);
#endif
Expand Down
6 changes: 4 additions & 2 deletions methods/Mangos/PlayerMethods.h
Original file line number Diff line number Diff line change
Expand Up @@ -2072,6 +2072,9 @@ namespace LuaPlayer
{
Unit* unit = E->CHECKOBJ<Unit>(2);

#if defined(ELUNA_MANGOS) && ELUNA_EXPANSION == EXP_MISTS
player->GetSession()->SendAuctionHello(unit);
#else
AuctionHouseEntry const* ahEntry = AuctionHouseMgr::GetAuctionHouseEntry(unit);
if (!ahEntry)
return 0;
Expand All @@ -2080,14 +2083,13 @@ 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_MISTS
data << uint32(ahEntry->ID);
#else
data << uint32(ahEntry->houseId);
#endif
data << uint8(1);

player->GetSession()->SendPacket(&data);
#endif
return 0;
}

Expand Down
Loading