mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SD3 Fixup pt1

Browse source
This commit is contained in:
Antz 2020-02-21 13:19:50 +00:00
parent 9d518956c9
commit 77308f0b33
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -21,7 +21,7 @@ project(MaNGOS)
cmake_minimum_required(VERSION 3.0)
set(MANGOS_VERSION 0.21)
set(MANGOS_EXP "MOP")
set(MANGOS_EXP "MISTS")
# Set the correct macro directory path
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
@ -106,7 +106,7 @@ endif()
#Include platform/compiler-specific definitions
include(${CMAKE_SOURCE_DIR}/cmake/SetDefinitions.cmake)
add_definitions(-DCATA)
add_definitions(-DMISTS)
message(STATUS "Install server to : ${CMAKE_INSTALL_PREFIX}")
message(STATUS "Install configs to : ${CONF_INSTALL_DIR}")

14
src/game/WorldHandlers/ScriptMgr.cpp
View file

@ -75,21 +75,21 @@ ScriptMgr::~ScriptMgr()
// returns priority (0 == can not start script)
uint8 GetSpellStartDBScriptPriority(SpellEntry const* spellinfo, SpellEffectIndex effIdx)
{
#if defined (CATA)
#if defined (CATA) || defined(MISTS)
SpellEffectEntry const* spellEffect = spellinfo->GetSpellEffect(effIdx);
if (!spellEffect)
{
return 0;
}
#endif
#if defined (CATA)
#if defined (CATA) || defined(MISTS)
if (spellEffect->Effect == SPELL_EFFECT_SCRIPT_EFFECT)
#else
if (spellinfo->Effect[effIdx] == SPELL_EFFECT_SCRIPT_EFFECT)
#endif
{ return 10; }
#if defined (CATA)
#if defined (CATA) || defined(MISTS)
if (spellEffect->Effect == SPELL_EFFECT_DUMMY)
#else
if (spellinfo->Effect[effIdx] == SPELL_EFFECT_DUMMY)
@ -97,7 +97,7 @@ uint8 GetSpellStartDBScriptPriority(SpellEntry const* spellinfo, SpellEffectInde
{ return 9; }
// NonExisting triggered spells can also start DB-Spell-Scripts
#if defined (CATA)
#if defined (CATA) || defined(MISTS)
if (spellEffect->Effect == SPELL_EFFECT_TRIGGER_SPELL && !sSpellStore.LookupEntry(spellEffect->EffectTriggerSpell))
#else
if (spellinfo->Effect[effIdx] == SPELL_EFFECT_TRIGGER_SPELL && !sSpellStore.LookupEntry(spellinfo->EffectTriggerSpell[effIdx]))
@ -105,7 +105,7 @@ uint8 GetSpellStartDBScriptPriority(SpellEntry const* spellinfo, SpellEffectInde
{ return 5; }
// NonExisting trigger missile spells can also start DB-Spell-Scripts
#if defined (CATA)
#if defined (CATA) || defined(MISTS)
if (spellEffect->Effect == SPELL_EFFECT_TRIGGER_MISSILE && !sSpellStore.LookupEntry(spellEffect->EffectTriggerSpell))
#else
if (spellinfo->Effect[effIdx] == SPELL_EFFECT_TRIGGER_MISSILE && !sSpellStore.LookupEntry(spellinfo->EffectTriggerSpell[effIdx]))
@ -666,7 +666,7 @@ void ScriptMgr::LoadScripts(DBScriptType type)
if (SpellEntry const* spell = sSpellStore.LookupEntry(i))
for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
{
#if defined (CATA)
#if defined (CATA) || defined(MISTS)
SpellEffectEntry const* spellEffect = spell->GetSpellEffect(SpellEffectIndex(j));
if (!spellEffect)
continue;
@ -2928,7 +2928,7 @@ void ScriptMgr::CollectPossibleEventIds(std::set<uint32>& eventIds)
{
for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
{
#if defined (CATA)
#if defined (CATA) || defined(MISTS)
SpellEffectEntry const* spellEffect = spell->GetSpellEffect(SpellEffectIndex(j));
if (!spellEffect)
continue;

2
src/modules/SD3

@ -1 +1 @@
Subproject commit 884850ef6dceb509128b0e9fb04f563f1d02d9fc
Subproject commit 4feb6a19c9bd3f3eb6f51dbf9ff390c5fe4cb345