Skip to content

Commit

Permalink
Fix MaNGOS Three build
Browse files Browse the repository at this point in the history
-Add MaNGOSThree to README
-Add MaNGOS Three to CI check
  • Loading branch information
Niam5 committed Aug 9, 2024
1 parent 13591ed commit 35f0fe5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
# fail-fast: false
# matrix:
# eluna: [ON, OFF]
# patch: [zero, one, two]
# patch: [zero, one, two, three]
# runs-on: ubuntu-20.04
# steps:
# - uses: actions/checkout@v4
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
5 changes: 5 additions & 0 deletions methods/Mangos/GlobalMethods.h
Original file line number Diff line number Diff line change
Expand Up @@ -1756,7 +1756,12 @@ namespace LuaGlobalFunctions

auto const itemlist = items->m_items;
for (auto itr = itemlist.begin(); itr != itemlist.end(); ++itr)

#if defined(MISTS) || defined (CATA)
eObjectMgr->RemoveVendorItem(entry, (*itr)->item, 1);
#else
eObjectMgr->RemoveVendorItem(entry, (*itr)->item);
#endif

return 0;
}
Expand Down
7 changes: 6 additions & 1 deletion methods/Mangos/UnitMethods.h
Original file line number Diff line number Diff line change
Expand Up @@ -1935,7 +1935,8 @@ namespace LuaUnit
float maxHeight = E->CHECKVAL<float>(6);
uint32 id = E->CHECKVAL<uint32>(7, 0);

#if WOTLK

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

for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
{
#if defined (CATA)
uint8 eff = SpellEffectIndex(i);
#else
uint8 eff = spellEntry->Effect[i];
#endif
if (eff >= TOTAL_SPELL_EFFECTS)
continue;

Expand Down

0 comments on commit 35f0fe5

Please sign in to comment.