mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 01:37:00 +00:00
[Core] Fix tabs
This commit is contained in:
parent
bbf0020c1a
commit
d54c7b7764
11 changed files with 69 additions and 69 deletions
|
|
@ -776,10 +776,10 @@ namespace MMAP
|
||||||
if (m_skipContinents)
|
if (m_skipContinents)
|
||||||
switch (mapID)
|
switch (mapID)
|
||||||
{
|
{
|
||||||
case 0: // Eastern Kingdoms
|
case 0: // Eastern Kingdoms
|
||||||
case 1: // Kalimdor
|
case 1: // Kalimdor
|
||||||
case 530: // Outland
|
case 530: // Outland
|
||||||
case 571: // Northrend
|
case 571: // Northrend
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
@ -835,52 +835,52 @@ namespace MMAP
|
||||||
switch (mapID)
|
switch (mapID)
|
||||||
{
|
{
|
||||||
// transport maps
|
// transport maps
|
||||||
case 582: // Transport: Rut'theran to Auberdine
|
case 582: // Transport: Rut'theran to Auberdine
|
||||||
case 584: // Transport: Menethil to Theramore
|
case 584: // Transport: Menethil to Theramore
|
||||||
case 586: // Transport: Exodar to Auberdine
|
case 586: // Transport: Exodar to Auberdine
|
||||||
case 587: // Transport: Feathermoon Ferry
|
case 587: // Transport: Feathermoon Ferry
|
||||||
case 588: // Transport: Menethil to Auberdine
|
case 588: // Transport: Menethil to Auberdine
|
||||||
case 589: // Transport: Orgrimmar to Grom'Gol
|
case 589: // Transport: Orgrimmar to Grom'Gol
|
||||||
case 590: // Transport: Grom'Gol to Undercity
|
case 590: // Transport: Grom'Gol to Undercity
|
||||||
case 591: // Transport: Undercity to Orgrimmar
|
case 591: // Transport: Undercity to Orgrimmar
|
||||||
case 592: // Transport: Borean Tundra Test
|
case 592: // Transport: Borean Tundra Test
|
||||||
case 593: // Transport: Booty Bay to Ratchet
|
case 593: // Transport: Booty Bay to Ratchet
|
||||||
case 594: // Transport: Howling Fjord Sister Mercy (Quest)
|
case 594: // Transport: Howling Fjord Sister Mercy (Quest)
|
||||||
case 596: // Transport: Naglfar
|
case 596: // Transport: Naglfar
|
||||||
case 610: // Transport: Tirisfal to Vengeance Landing
|
case 610: // Transport: Tirisfal to Vengeance Landing
|
||||||
case 612: // Transport: Menethil to Valgarde
|
case 612: // Transport: Menethil to Valgarde
|
||||||
case 613: // Transport: Orgrimmar to Warsong Hold
|
case 613: // Transport: Orgrimmar to Warsong Hold
|
||||||
case 614: // Transport: Stormwind to Valiance Keep
|
case 614: // Transport: Stormwind to Valiance Keep
|
||||||
case 620: // Transport: Moa'ki to Unu'pe
|
case 620: // Transport: Moa'ki to Unu'pe
|
||||||
case 621: // Transport: Moa'ki to Kamagua
|
case 621: // Transport: Moa'ki to Kamagua
|
||||||
case 622: // Transport: Orgrim's Hammer
|
case 622: // Transport: Orgrim's Hammer
|
||||||
case 623: // Transport: The Skybreaker
|
case 623: // Transport: The Skybreaker
|
||||||
case 641: // Transport: Alliance Airship BG
|
case 641: // Transport: Alliance Airship BG
|
||||||
case 642: // Transport: HordeAirshipBG
|
case 642: // Transport: HordeAirshipBG
|
||||||
case 647: // Transport: Orgrimmar to Thunder Bluff
|
case 647: // Transport: Orgrimmar to Thunder Bluff
|
||||||
case 662: // Transport: Alliance Vashj'ir Ship
|
case 662: // Transport: Alliance Vashj'ir Ship
|
||||||
case 672: // Transport: The Skybreaker (Icecrown Citadel Raid)
|
case 672: // Transport: The Skybreaker (Icecrown Citadel Raid)
|
||||||
case 673: // Transport: Orgrim's Hammer (Icecrown Citadel Raid)
|
case 673: // Transport: Orgrim's Hammer (Icecrown Citadel Raid)
|
||||||
case 674: // Transport: Ship to Vashj'ir
|
case 674: // Transport: Ship to Vashj'ir
|
||||||
case 712: // Transport: The Skybreaker (IC Dungeon)
|
case 712: // Transport: The Skybreaker (IC Dungeon)
|
||||||
case 713: // Transport: Orgrim's Hammer (IC Dungeon)
|
case 713: // Transport: Orgrim's Hammer (IC Dungeon)
|
||||||
case 718: // Transport: The Mighty Wind (Icecrown Citadel Raid)
|
case 718: // Transport: The Mighty Wind (Icecrown Citadel Raid)
|
||||||
case 738: // Ship to Vashj'ir (Orgrimmar -> Vashj'ir)
|
case 738: // Ship to Vashj'ir (Orgrimmar -> Vashj'ir)
|
||||||
case 739: // Vashj'ir Sub - Horde
|
case 739: // Vashj'ir Sub - Horde
|
||||||
case 740: // Vashj'ir Sub - Alliance
|
case 740: // Vashj'ir Sub - Alliance
|
||||||
case 741: // Twilight Highlands Horde Transport
|
case 741: // Twilight Highlands Horde Transport
|
||||||
case 742: // Vashj'ir Sub - Horde - Circling Abyssal Maw
|
case 742: // Vashj'ir Sub - Horde - Circling Abyssal Maw
|
||||||
case 743: // Vashj'ir Sub - Alliance circling Abyssal Maw
|
case 743: // Vashj'ir Sub - Alliance circling Abyssal Maw
|
||||||
case 746: // Uldum Phase Oasis
|
case 746: // Uldum Phase Oasis
|
||||||
case 747: // Transport: Deepholm Gunship
|
case 747: // Transport: Deepholm Gunship
|
||||||
case 748: // Transport: Onyxia/Nefarian Elevator
|
case 748: // Transport: Onyxia/Nefarian Elevator
|
||||||
case 749: // Transport: Gilneas Moving Gunship
|
case 749: // Transport: Gilneas Moving Gunship
|
||||||
case 750: // Transport: Gilneas Static Gunship
|
case 750: // Transport: Gilneas Static Gunship
|
||||||
case 762: // Twilight Highlands Zeppelin 1
|
case 762: // Twilight Highlands Zeppelin 1
|
||||||
case 763: // Twilight Highlands Zeppelin 2
|
case 763: // Twilight Highlands Zeppelin 2
|
||||||
case 765: // Krazzworks Attack Zeppelin
|
case 765: // Krazzworks Attack Zeppelin
|
||||||
case 766: // Transport: Gilneas Moving Gunship 02
|
case 766: // Transport: Gilneas Moving Gunship 02
|
||||||
case 767: // Transport: Gilneas Moving Gunship 03
|
case 767: // Transport: Gilneas Moving Gunship 03
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -57,9 +57,9 @@ class MPQFile
|
||||||
public:
|
public:
|
||||||
MPQFile(HANDLE mpq, const char* filename); // filenames are not case sensitive
|
MPQFile(HANDLE mpq, const char* filename); // filenames are not case sensitive
|
||||||
~MPQFile()
|
~MPQFile()
|
||||||
{
|
{
|
||||||
close();
|
close();
|
||||||
}
|
}
|
||||||
size_t read(void* dest, size_t bytes);
|
size_t read(void* dest, size_t bytes);
|
||||||
size_t getSize() { return size; }
|
size_t getSize() { return size; }
|
||||||
size_t getPos() { return pointer; }
|
size_t getPos() { return pointer; }
|
||||||
|
|
|
||||||
|
|
@ -431,7 +431,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
|
||||||
pHolder.UpdateRepeatTimer(m_creature, event.buffed.repeatMin, event.buffed.repeatMax);
|
pHolder.UpdateRepeatTimer(m_creature, event.buffed.repeatMin, event.buffed.repeatMax);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case EVENT_T_RECEIVE_AI_EVENT:
|
case EVENT_T_RECEIVE_AI_EVENT:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
sLog.outErrorEventAI("Creature %u using Event %u has invalid Event Type(%u), missing from ProcessEvent() Switch.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
|
sLog.outErrorEventAI("Creature %u using Event %u has invalid Event Type(%u), missing from ProcessEvent() Switch.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,8 @@
|
||||||
#define STRONG_MAX_LEVEL 255
|
#define STRONG_MAX_LEVEL 255
|
||||||
enum MountFlags
|
enum MountFlags
|
||||||
{
|
{
|
||||||
MOUNT_FLAG_CAN_PITCH = 0x4,
|
MOUNT_FLAG_CAN_PITCH = 0x4,
|
||||||
MOUNT_FLAG_CAN_SWIM = 0x8
|
MOUNT_FLAG_CAN_SWIM = 0x8
|
||||||
};
|
};
|
||||||
|
|
||||||
enum BattleGroundBracketId // bracketId for level ranges
|
enum BattleGroundBracketId // bracketId for level ranges
|
||||||
|
|
|
||||||
|
|
@ -572,8 +572,8 @@ void LoadDBCStores(const std::string& dataPath)
|
||||||
sMapDifficultyMap[MAKE_PAIR32(entry->MapId, entry->Difficulty)] = entry;
|
sMapDifficultyMap[MAKE_PAIR32(entry->MapId, entry->Difficulty)] = entry;
|
||||||
|
|
||||||
LoadDBC(availableDbcLocales, bar, bad_dbc_files, sMovieStore, dbcPath, "Movie.dbc");
|
LoadDBC(availableDbcLocales, bar, bad_dbc_files, sMovieStore, dbcPath, "Movie.dbc");
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files, sMountCapabilityStore, dbcPath,"MountCapability.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files, sMountCapabilityStore, dbcPath,"MountCapability.dbc");
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files, sMountTypeStore, dbcPath,"MountType.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files, sMountTypeStore, dbcPath,"MountType.dbc");
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sNumTalentsAtLevelStore, dbcPath,"NumTalentsAtLevel.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sNumTalentsAtLevelStore, dbcPath,"NumTalentsAtLevel.dbc");
|
||||||
LoadDBC(availableDbcLocales, bar, bad_dbc_files, sOverrideSpellDataStore, dbcPath, "OverrideSpellData.dbc");
|
LoadDBC(availableDbcLocales, bar, bad_dbc_files, sOverrideSpellDataStore, dbcPath, "OverrideSpellData.dbc");
|
||||||
LoadDBC(availableDbcLocales, bar, bad_dbc_files, sQuestFactionRewardStore, dbcPath, "QuestFactionReward.dbc");
|
LoadDBC(availableDbcLocales, bar, bad_dbc_files, sQuestFactionRewardStore, dbcPath, "QuestFactionReward.dbc");
|
||||||
|
|
|
||||||
|
|
@ -7676,7 +7676,7 @@ bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min
|
||||||
sLog.outErrorDb(">> Loaded 0 mangos strings. DB table `%s` is empty. Cannot continue.", table);
|
sLog.outErrorDb(">> Loaded 0 mangos strings. DB table `%s` is empty. Cannot continue.", table);
|
||||||
else
|
else
|
||||||
sLog.outString(">> Loaded 0 string templates. DB table `%s` is empty.", table);
|
sLog.outString(">> Loaded 0 string templates. DB table `%s` is empty.", table);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32 count = 0;
|
uint32 count = 0;
|
||||||
|
|
|
||||||
|
|
@ -3450,16 +3450,16 @@ void Aura::HandleAuraMounted(bool apply, bool Real)
|
||||||
}
|
}
|
||||||
|
|
||||||
target->Mount(display_id, GetId());
|
target->Mount(display_id, GetId());
|
||||||
if (MountCapabilityEntry const* mountCapability = target->GetMountCapability(uint32(GetMiscBValue())))
|
if (MountCapabilityEntry const* mountCapability = target->GetMountCapability(uint32(GetMiscBValue())))
|
||||||
target->CastSpell(target, mountCapability->SpeedModSpell, true);
|
target->CastSpell(target, mountCapability->SpeedModSpell, true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
target->Unmount(true);
|
target->Unmount(true);
|
||||||
|
|
||||||
// remove speed aura
|
// remove speed aura
|
||||||
if (MountCapabilityEntry const* mountCapability = target->GetMountCapability(m_modifier.m_amount))
|
if (MountCapabilityEntry const* mountCapability = target->GetMountCapability(m_modifier.m_amount))
|
||||||
target->RemoveAurasByCasterSpell(mountCapability->SpeedModSpell, target->GetObjectGuid());
|
target->RemoveAurasByCasterSpell(mountCapability->SpeedModSpell, target->GetObjectGuid());
|
||||||
|
|
||||||
CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(m_modifier.m_miscvalue);
|
CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(m_modifier.m_miscvalue);
|
||||||
if (ci && target->IsVehicle() && ci->vehicleId == target->GetVehicleInfo()->GetVehicleEntry()->m_ID)
|
if (ci && target->IsVehicle() && ci->vehicleId == target->GetVehicleInfo()->GetVehicleEntry()->m_ID)
|
||||||
|
|
|
||||||
|
|
@ -535,7 +535,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
|
||||||
return SPELL_UA_IMMOLATE;
|
return SPELL_UA_IMMOLATE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// Need Fix
|
// Need Fix
|
||||||
case SPELLFAMILY_PRIEST:
|
case SPELLFAMILY_PRIEST:
|
||||||
{
|
{
|
||||||
// "Well Fed" buff from Blessed Sunfruit, Blessed Sunfruit Juice, Alterac Spring Water
|
// "Well Fed" buff from Blessed Sunfruit, Blessed Sunfruit Juice, Alterac Spring Water
|
||||||
|
|
@ -759,7 +759,7 @@ bool IsPositiveEffect(SpellEntry const* spellproto, SpellEffectIndex effIndex)
|
||||||
case 37388: // Move 2
|
case 37388: // Move 2
|
||||||
case 49634: // Sergeant's Flare
|
case 49634: // Sergeant's Flare
|
||||||
case 54530: // Opening
|
case 54530: // Opening
|
||||||
case 56099: // Throw Ice
|
case 56099: // Throw Ice
|
||||||
case 62105: // To'kini's Blowgun
|
case 62105: // To'kini's Blowgun
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ enum WorldTimers
|
||||||
// just placeholder for int64 values
|
// just placeholder for int64 values
|
||||||
enum eConfigInt64Values
|
enum eConfigInt64Values
|
||||||
{
|
{
|
||||||
CONFIG_INT64_VALUE_COUNT = 1 // change this value after new constances added
|
CONFIG_INT64_VALUE_COUNT = 1 // change this value after new constances added
|
||||||
};
|
};
|
||||||
|
|
||||||
enum eConfigUInt64Values
|
enum eConfigUInt64Values
|
||||||
|
|
|
||||||
|
|
@ -720,7 +720,7 @@ class MANGOS_DLL_SPEC WorldSession
|
||||||
void HandleCorpseQueryOpcode(WorldPacket& recvPacket);
|
void HandleCorpseQueryOpcode(WorldPacket& recvPacket);
|
||||||
void HandleCorpseMapPositionQueryOpcode(WorldPacket& recvPacket);
|
void HandleCorpseMapPositionQueryOpcode(WorldPacket& recvPacket);
|
||||||
void HandleResurrectResponseOpcode(WorldPacket& recvPacket);
|
void HandleResurrectResponseOpcode(WorldPacket& recvPacket);
|
||||||
void HandleReturnToGraveyard(WorldPacket& recvPacket);
|
void HandleReturnToGraveyard(WorldPacket& recvPacket);
|
||||||
void HandleSummonResponseOpcode(WorldPacket& recv_data);
|
void HandleSummonResponseOpcode(WorldPacket& recv_data);
|
||||||
|
|
||||||
void HandleJoinChannelOpcode(WorldPacket& recvPacket);
|
void HandleJoinChannelOpcode(WorldPacket& recvPacket);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue