From a4a6ee223302e93e29c1e39dd30d5e2fdddd1850 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Thu, 16 Feb 2017 18:15:38 +0200 Subject: [PATCH] Add requested changes to support future MaNGOS wotlk build --- ElunaIncludes.h | 2 +- UnitMethods.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElunaIncludes.h b/ElunaIncludes.h index 7c2070f..26e6114 100644 --- a/ElunaIncludes.h +++ b/ElunaIncludes.h @@ -128,7 +128,7 @@ typedef ThreatContainer::StorageType ThreatList; #define SPELL_AURA_MOD_KILL_XP_PCT SPELL_AURA_MOD_XP_PCT #endif -#ifdef WOTLK +#if defined(WOTLK) && !defined(MANGOS) #define UNIT_BYTE2_FLAG_SANCTUARY UNIT_BYTE2_FLAG_SUPPORTABLE #endif diff --git a/UnitMethods.h b/UnitMethods.h index f467945..b3545f6 100644 --- a/UnitMethods.h +++ b/UnitMethods.h @@ -2177,7 +2177,7 @@ namespace LuaUnit float maxHeight = Eluna::CHECKVAL(L, 6); uint32 id = Eluna::CHECKVAL(L, 7, 0); -#if defined(CMANGOS) && defined(WOTLK) +#if (defined(CMANGOS) || defined(MANGOS)) && defined(WOTLK) unit->GetMotionMaster()->MoveJump(x, y, z, zSpeed, maxHeight, id); #else Position pos(x, y, z);