Skip to content

Commit

Permalink
Fix MaNGOS Three build
Browse files Browse the repository at this point in the history
-Add MaNGOSThree to README
  • Loading branch information
Niam5 committed Sep 10, 2023
1 parent a242bfe commit e549012
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Mangos/GlobalMethods.h
Original file line number Diff line number Diff line change
Expand Up @@ -1976,7 +1976,7 @@ namespace LuaGlobalFunctions

auto const itemlist = items->m_items;
for (auto itr = itemlist.begin(); itr != itemlist.end(); ++itr)
#if defined(CATA) || defined(MISTS)
#if defined(MISTS) || (defined MANGOS && defined CATA)
eObjectMgr->RemoveVendorItem(entry, (*itr)->item, 1);
#else
#ifdef TRINITY
Expand Down
6 changes: 1 addition & 5 deletions Mangos/PlayerMethods.h
Original file line number Diff line number Diff line change
Expand Up @@ -2749,15 +2749,11 @@ namespace LuaPlayer
{
bool no_cost = Eluna::CHECKVAL<bool>(L, 2, true);

#ifdef CATA
player->ResetTalents(no_cost);
#else
#ifdef TRINITY
#if defined TRINITY
player->ResetTalents(no_cost);
#else
player->resetTalents(no_cost);
#endif
#endif
#if (!defined(TBC) && !defined(CLASSIC))
player->SendTalentsInfoData(false);
#endif
Expand Down
6 changes: 5 additions & 1 deletion Mangos/UnitMethods.h
Original file line number Diff line number Diff line change
Expand Up @@ -2338,7 +2338,7 @@ namespace LuaUnit
float maxHeight = Eluna::CHECKVAL<float>(L, 6);
uint32 id = Eluna::CHECKVAL<uint32>(L, 7, 0);

#if (defined(CMANGOS) || defined(MANGOS)) && defined(WOTLK)
#if (defined(CMANGOS) || defined(MANGOS)) && (defined(WOTLK) || defined(CATA))
unit->GetMotionMaster()->MoveJump(x, y, z, zSpeed, maxHeight, id);
#else
Position pos(x, y, z);
Expand Down Expand Up @@ -2645,7 +2645,11 @@ namespace LuaUnit

for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
{
#if defined(MANGOS) && defined (CATA)
uint8 eff = SpellEffectIndex(i);
#else
uint8 eff = spellEntry->Effect[i];
#endif
#ifndef CMANGOS
if (eff >= TOTAL_SPELL_EFFECTS)
#else
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ Core sources and forks with required modifications for Eluna:

[Official MaNGOS Zero with Eluna](https://github.com/mangoszero/server)
[Official MaNGOS One with Eluna](https://github.com/mangosone/server)
[Official MaNGOS Two with Eluna](https://github.com/mangostwo/server)
[Official MaNGOS Two with Eluna](https://github.com/mangostwo/server)
[Official MaNGOS Three with Eluna](https://github.com/mangosthree/server)

[Eluna cMaNGOS Classic](https://github.com/Niam5/Eluna-CMaNGOS-Classic) - maintained by [Niam5](https://github.com/Niam5)
[Eluna cMaNGOS TBC](https://github.com/Niam5/Eluna-CMaNGOS-TBC) - maintained by [Niam5](https://github.com/Niam5)
Expand Down

0 comments on commit e549012

Please sign in to comment.