diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp index d2bf12745..0f494742a 100644 --- a/contrib/mmap/src/MapBuilder.cpp +++ b/contrib/mmap/src/MapBuilder.cpp @@ -776,10 +776,10 @@ namespace MMAP if (m_skipContinents) switch (mapID) { - case 0: // Eastern Kingdoms - case 1: // Kalimdor - case 530: // Outland - case 571: // Northrend + case 0: // Eastern Kingdoms + case 1: // Kalimdor + case 530: // Outland + case 571: // Northrend return true; default: break; @@ -835,52 +835,52 @@ namespace MMAP switch (mapID) { // transport maps - case 582: // Transport: Rut'theran to Auberdine - case 584: // Transport: Menethil to Theramore - case 586: // Transport: Exodar to Auberdine - case 587: // Transport: Feathermoon Ferry - case 588: // Transport: Menethil to Auberdine - case 589: // Transport: Orgrimmar to Grom'Gol - case 590: // Transport: Grom'Gol to Undercity - case 591: // Transport: Undercity to Orgrimmar - case 592: // Transport: Borean Tundra Test - case 593: // Transport: Booty Bay to Ratchet - case 594: // Transport: Howling Fjord Sister Mercy (Quest) - case 596: // Transport: Naglfar - case 610: // Transport: Tirisfal to Vengeance Landing - case 612: // Transport: Menethil to Valgarde - case 613: // Transport: Orgrimmar to Warsong Hold - case 614: // Transport: Stormwind to Valiance Keep - case 620: // Transport: Moa'ki to Unu'pe - case 621: // Transport: Moa'ki to Kamagua - case 622: // Transport: Orgrim's Hammer - case 623: // Transport: The Skybreaker - case 641: // Transport: Alliance Airship BG - case 642: // Transport: HordeAirshipBG - case 647: // Transport: Orgrimmar to Thunder Bluff - case 662: // Transport: Alliance Vashj'ir Ship - case 672: // Transport: The Skybreaker (Icecrown Citadel Raid) - case 673: // Transport: Orgrim's Hammer (Icecrown Citadel Raid) - case 674: // Transport: Ship to Vashj'ir - case 712: // Transport: The Skybreaker (IC Dungeon) - case 713: // Transport: Orgrim's Hammer (IC Dungeon) - case 718: // Transport: The Mighty Wind (Icecrown Citadel Raid) - case 738: // Ship to Vashj'ir (Orgrimmar -> Vashj'ir) - case 739: // Vashj'ir Sub - Horde - case 740: // Vashj'ir Sub - Alliance - case 741: // Twilight Highlands Horde Transport - case 742: // Vashj'ir Sub - Horde - Circling Abyssal Maw - case 743: // Vashj'ir Sub - Alliance circling Abyssal Maw - case 746: // Uldum Phase Oasis - case 747: // Transport: Deepholm Gunship - case 748: // Transport: Onyxia/Nefarian Elevator - case 749: // Transport: Gilneas Moving Gunship - case 750: // Transport: Gilneas Static Gunship - case 762: // Twilight Highlands Zeppelin 1 - case 763: // Twilight Highlands Zeppelin 2 - case 765: // Krazzworks Attack Zeppelin - case 766: // Transport: Gilneas Moving Gunship 02 - case 767: // Transport: Gilneas Moving Gunship 03 + case 582: // Transport: Rut'theran to Auberdine + case 584: // Transport: Menethil to Theramore + case 586: // Transport: Exodar to Auberdine + case 587: // Transport: Feathermoon Ferry + case 588: // Transport: Menethil to Auberdine + case 589: // Transport: Orgrimmar to Grom'Gol + case 590: // Transport: Grom'Gol to Undercity + case 591: // Transport: Undercity to Orgrimmar + case 592: // Transport: Borean Tundra Test + case 593: // Transport: Booty Bay to Ratchet + case 594: // Transport: Howling Fjord Sister Mercy (Quest) + case 596: // Transport: Naglfar + case 610: // Transport: Tirisfal to Vengeance Landing + case 612: // Transport: Menethil to Valgarde + case 613: // Transport: Orgrimmar to Warsong Hold + case 614: // Transport: Stormwind to Valiance Keep + case 620: // Transport: Moa'ki to Unu'pe + case 621: // Transport: Moa'ki to Kamagua + case 622: // Transport: Orgrim's Hammer + case 623: // Transport: The Skybreaker + case 641: // Transport: Alliance Airship BG + case 642: // Transport: HordeAirshipBG + case 647: // Transport: Orgrimmar to Thunder Bluff + case 662: // Transport: Alliance Vashj'ir Ship + case 672: // Transport: The Skybreaker (Icecrown Citadel Raid) + case 673: // Transport: Orgrim's Hammer (Icecrown Citadel Raid) + case 674: // Transport: Ship to Vashj'ir + case 712: // Transport: The Skybreaker (IC Dungeon) + case 713: // Transport: Orgrim's Hammer (IC Dungeon) + case 718: // Transport: The Mighty Wind (Icecrown Citadel Raid) + case 738: // Ship to Vashj'ir (Orgrimmar -> Vashj'ir) + case 739: // Vashj'ir Sub - Horde + case 740: // Vashj'ir Sub - Alliance + case 741: // Twilight Highlands Horde Transport + case 742: // Vashj'ir Sub - Horde - Circling Abyssal Maw + case 743: // Vashj'ir Sub - Alliance circling Abyssal Maw + case 746: // Uldum Phase Oasis + case 747: // Transport: Deepholm Gunship + case 748: // Transport: Onyxia/Nefarian Elevator + case 749: // Transport: Gilneas Moving Gunship + case 750: // Transport: Gilneas Static Gunship + case 762: // Twilight Highlands Zeppelin 1 + case 763: // Twilight Highlands Zeppelin 2 + case 765: // Krazzworks Attack Zeppelin + case 766: // Transport: Gilneas Moving Gunship 02 + case 767: // Transport: Gilneas Moving Gunship 03 return true; default: return false; diff --git a/contrib/vmap_extractor/vmapextract/mpqfile.h b/contrib/vmap_extractor/vmapextract/mpqfile.h index 5e4ce3f22..4e749299c 100644 --- a/contrib/vmap_extractor/vmapextract/mpqfile.h +++ b/contrib/vmap_extractor/vmapextract/mpqfile.h @@ -57,9 +57,9 @@ class MPQFile public: MPQFile(HANDLE mpq, const char* filename); // filenames are not case sensitive ~MPQFile() - { - close(); - } + { + close(); + } size_t read(void* dest, size_t bytes); size_t getSize() { return size; } size_t getPos() { return pointer; } diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index 18bf3d429..e086b9e0f 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -431,7 +431,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction pHolder.UpdateRepeatTimer(m_creature, event.buffed.repeatMin, event.buffed.repeatMax); break; } - case EVENT_T_RECEIVE_AI_EVENT: + case EVENT_T_RECEIVE_AI_EVENT: break; 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); diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h index 13626c3ec..be8392c7e 100644 --- a/src/game/DBCEnums.h +++ b/src/game/DBCEnums.h @@ -39,8 +39,8 @@ #define STRONG_MAX_LEVEL 255 enum MountFlags { - MOUNT_FLAG_CAN_PITCH = 0x4, - MOUNT_FLAG_CAN_SWIM = 0x8 + MOUNT_FLAG_CAN_PITCH = 0x4, + MOUNT_FLAG_CAN_SWIM = 0x8 }; enum BattleGroundBracketId // bracketId for level ranges diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp index 427f9549b..d8ac4b80c 100644 --- a/src/game/DBCStores.cpp +++ b/src/game/DBCStores.cpp @@ -572,8 +572,8 @@ void LoadDBCStores(const std::string& dataPath) sMapDifficultyMap[MAKE_PAIR32(entry->MapId, entry->Difficulty)] = entry; 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, sMountTypeStore, dbcPath,"MountType.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,sNumTalentsAtLevelStore, dbcPath,"NumTalentsAtLevel.dbc"); LoadDBC(availableDbcLocales, bar, bad_dbc_files, sOverrideSpellDataStore, dbcPath, "OverrideSpellData.dbc"); LoadDBC(availableDbcLocales, bar, bad_dbc_files, sQuestFactionRewardStore, dbcPath, "QuestFactionReward.dbc"); diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index c42746c7f..80e51abb0 100755 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -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); else sLog.outString(">> Loaded 0 string templates. DB table `%s` is empty.", table); - return false; + return false; } uint32 count = 0; diff --git a/src/game/Player.cpp b/src/game/Player.cpp index e06168a73..d67a3549b 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -4608,7 +4608,7 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness) RemoveAurasDueToSpell(20584); // speed bonuses RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST - SetDeathState(ALIVE); + SetDeathState(ALIVE); SetWaterWalk(false); SetRoot(false); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 28ba66ce0..d0f0bbc22 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -3450,16 +3450,16 @@ void Aura::HandleAuraMounted(bool apply, bool Real) } target->Mount(display_id, GetId()); - if (MountCapabilityEntry const* mountCapability = target->GetMountCapability(uint32(GetMiscBValue()))) - target->CastSpell(target, mountCapability->SpeedModSpell, true); + if (MountCapabilityEntry const* mountCapability = target->GetMountCapability(uint32(GetMiscBValue()))) + target->CastSpell(target, mountCapability->SpeedModSpell, true); } else { target->Unmount(true); - // remove speed aura - if (MountCapabilityEntry const* mountCapability = target->GetMountCapability(m_modifier.m_amount)) - target->RemoveAurasByCasterSpell(mountCapability->SpeedModSpell, target->GetObjectGuid()); + // remove speed aura + if (MountCapabilityEntry const* mountCapability = target->GetMountCapability(m_modifier.m_amount)) + target->RemoveAurasByCasterSpell(mountCapability->SpeedModSpell, target->GetObjectGuid()); CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(m_modifier.m_miscvalue); if (ci && target->IsVehicle() && ci->vehicleId == target->GetVehicleInfo()->GetVehicleEntry()->m_ID) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index bcf3ac6a2..76649af7d 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -535,7 +535,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId) return SPELL_UA_IMMOLATE; break; } - // Need Fix + // Need Fix case SPELLFAMILY_PRIEST: { // "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 49634: // Sergeant's Flare case 54530: // Opening - case 56099: // Throw Ice + case 56099: // Throw Ice case 62105: // To'kini's Blowgun return true; default: diff --git a/src/game/World.h b/src/game/World.h index 4e5e99521..6663ed622 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -92,7 +92,7 @@ enum WorldTimers // just placeholder for int64 values 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 diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index fb6c8f47f..77a62afe7 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -720,7 +720,7 @@ class MANGOS_DLL_SPEC WorldSession void HandleCorpseQueryOpcode(WorldPacket& recvPacket); void HandleCorpseMapPositionQueryOpcode(WorldPacket& recvPacket); void HandleResurrectResponseOpcode(WorldPacket& recvPacket); - void HandleReturnToGraveyard(WorldPacket& recvPacket); + void HandleReturnToGraveyard(WorldPacket& recvPacket); void HandleSummonResponseOpcode(WorldPacket& recv_data); void HandleJoinChannelOpcode(WorldPacket& recvPacket);