diff options
Diffstat (limited to 'src')
109 files changed, 0 insertions, 149 deletions
diff --git a/src/common/Collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h index 90c077d6764..f15e80b9a2e 100644 --- a/src/common/Collision/BoundingIntervalHierarchyWrapper.h +++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h @@ -23,7 +23,6 @@ #include <G3D/Array.h> #include <G3D/Set.h> - template<class T, class BoundsFunc = BoundsTrait<T> > class BIHWrap { diff --git a/src/common/Collision/DynamicTree.h b/src/common/Collision/DynamicTree.h index a890f828b96..b62044b9544 100644 --- a/src/common/Collision/DynamicTree.h +++ b/src/common/Collision/DynamicTree.h @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - #ifndef _DYNTREE_H #define _DYNTREE_H diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h index 5412634df49..bb787604ec0 100644 --- a/src/common/Collision/Management/MMapManager.h +++ b/src/common/Collision/Management/MMapManager.h @@ -51,7 +51,6 @@ namespace MMAP MMapTileSet loadedTileRefs; // maps [map grid coords] to [dtTile] }; - typedef std::unordered_map<uint32, MMapData*> MMapDataSet; // singleton class diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h index f3d47c53440..bcb24f58709 100644 --- a/src/common/Collision/Maps/MapTree.h +++ b/src/common/Collision/Maps/MapTree.h @@ -22,7 +22,6 @@ #include "BoundingIntervalHierarchy.h" #include <unordered_map> - namespace VMAP { class ModelInstance; diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index 7096e1284b1..c8dc2d46620 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -445,7 +445,6 @@ namespace VMAP READ_OR_RETURN(&mogpflags, sizeof(uint32)); READ_OR_RETURN(&GroupWMOID, sizeof(uint32)); - Vector3 vec1, vec2; READ_OR_RETURN(&vec1, sizeof(Vector3)); diff --git a/src/common/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp index 842203278fb..a2ace0eb41b 100644 --- a/src/common/DataStores/DBCFileLoader.cpp +++ b/src/common/DataStores/DBCFileLoader.cpp @@ -43,7 +43,6 @@ bool DBCFileLoader::Load(char const* filename, char const* fmt) return false; } - EndianConvert(header); if (header != 0x43424457) //'WDBC' diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 55080cfa051..d0ad45b6762 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -56,7 +56,6 @@ bool WheatyExceptionReport::alreadyCrashed; std::mutex WheatyExceptionReport::alreadyCrashedLock; WheatyExceptionReport::pRtlGetVersion WheatyExceptionReport::RtlGetVersion; - // Declare global instance of class WheatyExceptionReport g_WheatyExceptionReport; @@ -1286,7 +1285,6 @@ bool logChildren) dataKind == DataIsStaticMember) continue; - symbolDetails.top().HasChildren = true; if (!logChildren) { diff --git a/src/common/Metric/Metric.h b/src/common/Metric/Metric.h index d8dcc53fd43..6871d5fa021 100644 --- a/src/common/Metric/Metric.h +++ b/src/common/Metric/Metric.h @@ -131,7 +131,6 @@ public: #define sMetric Metric::instance() - template<typename LoggerType> class MetricStopWatch { diff --git a/src/server/database/Database/Field.h b/src/server/database/Database/Field.h index a871ef64bfd..0229c852647 100644 --- a/src/server/database/Database/Field.h +++ b/src/server/database/Database/Field.h @@ -116,7 +116,6 @@ class TC_DATABASE_API Field return buf; } - bool IsNull() const { return data.value == nullptr; diff --git a/src/server/game/AI/SelectableAI.h b/src/server/game/AI/SelectableAI.h index 7b28049ffd5..3bc1f11c1b1 100644 --- a/src/server/game/AI/SelectableAI.h +++ b/src/server/game/AI/SelectableAI.h @@ -35,5 +35,4 @@ struct SelectableAI : public FactoryHolder<AI, O>, public Permissible<O>, public bool IsScriptNameAllowedInDB() const final override { return is_db_allowed; } }; - #endif // SelectableAI_h__ diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index f85e9588fea..15f1035273e 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -187,7 +187,6 @@ bool Battlefield::Update(uint32 diff) objective_changed = true; } - if (m_LastResurrectTimer <= diff) { for (uint8 i = 0; i < m_GraveyardList.size(); i++) diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index 239041b3948..998d73f4aff 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -225,7 +225,6 @@ class TC_GAME_API Channel bool IsOn(ObjectGuid who) const { return _playersStore.find(who) != _playersStore.end(); } bool IsBanned(ObjectGuid guid) const { return _bannedStore.find(guid) != _bannedStore.end(); } - uint8 GetPlayerFlags(ObjectGuid guid) const { PlayerContainer::const_iterator itr = _playersStore.find(guid); diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.cpp b/src/server/game/Chat/ChatCommands/ChatCommand.cpp index f8b01feca33..cecd6ff333d 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.cpp +++ b/src/server/game/Chat/ChatCommands/ChatCommand.cpp @@ -488,4 +488,3 @@ void Trinity::ChatCommands::InvalidateCommandMap() { Trinity::Impl::ChatCommands bool Trinity::ChatCommands::TryExecuteCommand(ChatHandler& handler, std::string_view cmd) { return Trinity::Impl::ChatCommands::ChatCommandNode::TryExecuteCommand(handler, cmd); } void Trinity::ChatCommands::SendCommandHelpFor(ChatHandler& handler, std::string_view cmd) { Trinity::Impl::ChatCommands::ChatCommandNode::SendCommandHelpFor(handler, cmd); } std::vector<std::string> Trinity::ChatCommands::GetAutoCompletionsFor(ChatHandler const& handler, std::string_view cmd) { return Trinity::Impl::ChatCommands::ChatCommandNode::GetAutoCompletionsFor(handler, cmd); } - diff --git a/src/server/game/Combat/CombatManager.h b/src/server/game/Combat/CombatManager.h index 8dc3aef83c9..d945c44a412 100644 --- a/src/server/game/Combat/CombatManager.h +++ b/src/server/game/Combat/CombatManager.h @@ -137,7 +137,6 @@ class TC_GAME_API CombatManager std::unordered_map<ObjectGuid, CombatReference*> _pveRefs; std::unordered_map<ObjectGuid, PvPCombatReference*> _pvpRefs; - friend struct CombatReference; friend struct PvPCombatReference; }; diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index 25b599afac9..41ce8c083fa 100644 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -153,7 +153,6 @@ bool Corpse::LoadCorpseFromDB(ObjectGuid::LowType guid, Field* fields) // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 // SELECT posX, posY, posZ, orientation, mapId, displayId, itemCache, bytes1, bytes2, guildId, flags, dynFlags, time, corpseType, instanceId, phaseMask, guid FROM corpse WHERE mapId = ? AND instanceId = ? - ObjectGuid::LowType ownerGuid = fields[16].GetUInt32(); float posX = fields[0].GetFloat(); float posY = fields[1].GetFloat(); diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 34983028dc5..e5704936af8 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1886,7 +1886,6 @@ bool Creature::CanStartAttack(Unit const* who, bool force) const return IsWithinLOSInMap(who); } - bool Creature::CheckNoGrayAggroConfig(uint32 playerLevel, uint32 creatureLevel) const { if (Trinity::XP::GetColorCode(playerLevel, creatureLevel) != XP_GRAY) diff --git a/src/server/game/Entities/Item/ItemTemplate.cpp b/src/server/game/Entities/Item/ItemTemplate.cpp index 016b2cfc4fb..8c70a624936 100644 --- a/src/server/game/Entities/Item/ItemTemplate.cpp +++ b/src/server/game/Entities/Item/ItemTemplate.cpp @@ -52,7 +52,6 @@ bool ItemTemplate::CanChangeEquipStateInCombat() const return false; } - float ItemTemplate::getDPS() const { if (!Delay) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 590b351d762..1ed1b859855 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -188,7 +188,6 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c if (target == this) // building packet for yourself flags |= UPDATEFLAG_SELF; - if (isType(TYPEMASK_UNIT)) { if (ToUnit()->GetVictim()) diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 151f1815cc6..d887f260378 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -692,7 +692,6 @@ void Pet::Update(uint32 diff) Creature::Update(diff); } - void Pet::LoseHappiness() { uint32 curValue = GetPower(POWER_HAPPINESS); diff --git a/src/server/game/Entities/Player/EquipmentSet.h b/src/server/game/Entities/Player/EquipmentSet.h index c1a44016f8e..8ace709860e 100644 --- a/src/server/game/Entities/Player/EquipmentSet.h +++ b/src/server/game/Entities/Player/EquipmentSet.h @@ -54,5 +54,4 @@ struct EquipmentSetInfo typedef std::map<uint64, EquipmentSetInfo> EquipmentSetContainer; - #endif // EquipmentSet_h__ diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 612807406e5..16c3638c7b6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7076,7 +7076,6 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) GetMap()->SendZoneDynamicInfo(newZone, this); - // in PvP, any not controlled zone (except zone->FactionGroupMask == 6, default case) // in PvE, only opposition team capital switch (zone->FactionGroupMask) @@ -18569,7 +18568,6 @@ void Player::_LoadQuestStatus(PreparedQueryResult result) ++slot; } - TC_LOG_DEBUG("entities.player.loading", "Player::_LoadQuestStatus: Quest status is {%u} for quest {%u} for player (%s)", questStatusData.Status, quest_id, GetGUID().ToString().c_str()); } } @@ -19881,7 +19879,6 @@ void Player::_SaveInventory(CharacterDatabaseTransaction trans) m_itemUpdateQueue.clear(); } - void Player::_SaveMail(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt; @@ -25940,7 +25937,6 @@ void Player::_SaveGlyphs(CharacterDatabaseTransaction trans) const stmt->setUInt32(0, GetGUID().GetCounter()); trans->Append(stmt); - for (uint8 spec = 0; spec < m_specsCount; ++spec) { uint8 index = 0; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index de224434c24..4555c9ef48a 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -474,7 +474,6 @@ enum QuestSaveType // quest typedef std::map<uint32, QuestSaveType> QuestStatusSaveMap; - enum QuestSlotOffsets { QUEST_ID_OFFSET = 0, diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index bf4e5dc36a9..287829d39bf 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -856,7 +856,6 @@ bool VehicleJoinEvent::Execute(uint64, uint32) if (veSeat->HasFlag(VEHICLE_SEAT_FLAG_PASSENGER_NOT_SELECTABLE)) Passenger->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - float o = veSeatAddon ? veSeatAddon->SeatOrientationOffset : 0.f; float x = veSeat->AttachmentOffset.X; float y = veSeat->AttachmentOffset.Y; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index bb20dadc9b0..fdd51329b91 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2314,7 +2314,6 @@ ObjectGuid::LowType ObjectMgr::AddGameObjectData(uint32 entry, uint32 mapId, Pos return spawnId; } - ObjectGuid::LowType ObjectMgr::AddCreatureData(uint32 entry, uint32 mapId, Position const& pos, uint32 spawntimedelay /*= 0*/) { CreatureTemplate const* cInfo = GetCreatureTemplate(entry); @@ -3970,7 +3969,6 @@ void ObjectMgr::LoadPlayerInfo() } } - // Load playercreate skills TC_LOG_INFO("server.loading", "Loading Player Create Skill Data..."); { @@ -6131,7 +6129,6 @@ void ObjectMgr::LoadGossipText() "text7_0, text7_1, BroadcastTextID7, lang7, Probability7, EmoteDelay7_0, Emote7_0, EmoteDelay7_1, Emote7_1, EmoteDelay7_2, Emote7_2 " "FROM npc_text"); - if (!result) { TC_LOG_INFO("server.loading", ">> Loaded 0 npc texts, table is empty!"); @@ -6190,7 +6187,6 @@ void ObjectMgr::LoadGossipText() gOption.BroadcastTextID = 0; } - } } @@ -7047,7 +7043,6 @@ void ObjectMgr::RemoveGraveyardLink(uint32 id, uint32 zoneId, uint32 team, bool bool found = false; - for (; range.first != range.second; ++range.first) { GraveyardData & data = range.first->second; @@ -9680,7 +9675,6 @@ std::string const& ObjectMgr::GetScriptName(uint32 id) const return (id < _scriptNamesStore.size()) ? _scriptNamesStore[id] : empty; } - uint32 ObjectMgr::GetScriptId(std::string const& name) { // use binary search to find the script name in the sorted vector diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 70e9844a89c..f4ceca2174a 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -705,7 +705,6 @@ struct PlayerInfo std::unique_ptr<PlayerLevelInfo[]> levelInfo; }; - typedef std::multimap<int32, uint32> ExclusiveQuestGroups; // exclusiveGroupId -> quest typedef std::pair<ExclusiveQuestGroups::const_iterator, ExclusiveQuestGroups::const_iterator> ExclusiveQuestGroupsBounds; diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index 9327974a1e4..5c2d958ed2c 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -156,7 +156,6 @@ void Trinity::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m) } } - template<class Check> void Trinity::WorldObjectLastSearcher<Check>::Visit(GameObjectMapType &m) { diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 017243afb7d..7e9880e2254 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -2218,7 +2218,6 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo) CharacterDatabase.Execute(stmt); } - // i don't know for sure if hash_map iterators m_boundInstances[diff].erase(itr); itr = m_boundInstances[diff].begin(); @@ -2502,7 +2501,6 @@ bool Group::HasFreeSlotSubGroup(uint8 subgroup) const return (m_subGroupsCounts && m_subGroupsCounts[subgroup] < MAXGROUPSIZE); } - uint8 Group::GetMemberGroup(ObjectGuid guid) const { member_citerator mslot = _getMemberCSlot(guid); diff --git a/src/server/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h index c592654ca43..5b20f285818 100644 --- a/src/server/game/Groups/GroupMgr.h +++ b/src/server/game/Groups/GroupMgr.h @@ -48,7 +48,6 @@ public: void AddGroup(Group* group); void RemoveGroup(Group* group); - protected: ObjectGuid::LowType NextGroupId; uint32 NextGroupDbStoreId; diff --git a/src/server/game/Maps/AreaBoundary.cpp b/src/server/game/Maps/AreaBoundary.cpp index 9b207087a91..098dc290d48 100644 --- a/src/server/game/Maps/AreaBoundary.cpp +++ b/src/server/game/Maps/AreaBoundary.cpp @@ -32,7 +32,6 @@ bool RectangleBoundary::IsWithinBoundaryArea(Position const* pos) const ); } - // ---== CIRCLE ==--- CircleBoundary::CircleBoundary(Position const& center, double radius, bool isInverted) : AreaBoundary(isInverted), _center(center), _radiusSq(radius*radius) { } @@ -45,7 +44,6 @@ bool CircleBoundary::IsWithinBoundaryArea(Position const* pos) const return offX*offX+offY*offY <= _radiusSq; } - // ---== ELLIPSE ==--- EllipseBoundary::EllipseBoundary(Position const& center, double radiusX, double radiusY, bool isInverted) : AreaBoundary(isInverted), _center(center), _radiusYSq(radiusY*radiusY), _scaleXSq(_radiusYSq / (radiusX*radiusX)) { } @@ -56,7 +54,6 @@ bool EllipseBoundary::IsWithinBoundaryArea(Position const* pos) const return (offX*offX)*_scaleXSq + (offY*offY) <= _radiusYSq; } - // ---== TRIANGLE ==--- TriangleBoundary::TriangleBoundary(Position const& pointA, Position const& pointB, Position const& pointC, bool isInverted) : AreaBoundary(isInverted), _a(pointA), _b(pointB), _c(pointC), _abx(_b.GetDoublePositionX()-_a.GetDoublePositionX()), _bcx(_c.GetDoublePositionX()-_b.GetDoublePositionX()), _cax(_a.GetDoublePositionX() - _c.GetDoublePositionX()), _aby(_b.GetDoublePositionY()-_a.GetDoublePositionY()), _bcy(_c.GetDoublePositionY()-_b.GetDoublePositionY()), _cay(_a.GetDoublePositionY() - _c.GetDoublePositionY()) { } @@ -71,7 +68,6 @@ bool TriangleBoundary::IsWithinBoundaryArea(Position const* pos) const return ((sign1 == sign2) && (sign2 == sign3)); } - // ---== PARALLELOGRAM ==--- ParallelogramBoundary::ParallelogramBoundary(Position const& cornerA, Position const& cornerB, Position const& cornerD, bool isInverted) : AreaBoundary(isInverted), _a(cornerA), _b(cornerB), _d(cornerD), _c(DoublePosition(_d.GetDoublePositionX() + (_b.GetDoublePositionX() - _a.GetDoublePositionX()), _d.GetDoublePositionY() + (_b.GetDoublePositionY() - _a.GetDoublePositionY()))), _abx(_b.GetDoublePositionX() - _a.GetDoublePositionX()), _dax(_a.GetDoublePositionX() - _d.GetDoublePositionX()), _aby(_b.GetDoublePositionY() - _a.GetDoublePositionY()), _day(_a.GetDoublePositionY() - _d.GetDoublePositionY()) { } @@ -87,7 +83,6 @@ bool ParallelogramBoundary::IsWithinBoundaryArea(Position const* pos) const return ((sign1 == sign2) && (sign2 == sign3) && (sign3 == sign4)); } - // ---== Z RANGE ==--- ZRangeBoundary::ZRangeBoundary(float minZ, float maxZ, bool isInverted) : AreaBoundary(isInverted), _minZ(minZ), _maxZ(maxZ) { } @@ -96,7 +91,6 @@ bool ZRangeBoundary::IsWithinBoundaryArea(Position const* pos) const return (_minZ <= pos->GetPositionZ() && pos->GetPositionZ() <= _maxZ); } - // ---== UNION OF 2 BOUNDARIES ==--- BoundaryUnionBoundary::BoundaryUnionBoundary(AreaBoundary const* b1, AreaBoundary const* b2, bool isInverted) : AreaBoundary(isInverted), _b1(b1), _b2(b2) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index a751dcf3073..77b4de4a5e1 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -69,7 +69,6 @@ static uint16 const holetab_v[4] = { 0x000F, 0x00F0, 0x0F00, 0xF000 }; GridState* si_GridStates[MAX_GRID_STATE]; - ZoneDynamicInfo::ZoneDynamicInfo() : MusicId(0), DefaultWeather(nullptr), WeatherId(WEATHER_STATE_FINE), Intensity(0.0f) { } diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp index 533f75b51c5..baa26669b59 100644 --- a/src/server/game/Maps/MapUpdater.cpp +++ b/src/server/game/Maps/MapUpdater.cpp @@ -22,7 +22,6 @@ #include <mutex> - class MapUpdateRequest { private: diff --git a/src/server/game/Miscellaneous/CommonPredicates.h b/src/server/game/Miscellaneous/CommonPredicates.h index b22e89890cc..54040245972 100644 --- a/src/server/game/Miscellaneous/CommonPredicates.h +++ b/src/server/game/Miscellaneous/CommonPredicates.h @@ -66,5 +66,4 @@ namespace Trinity } } - #endif //TRINITY_COMMONPREDICATES_H diff --git a/src/server/game/Pools/QuestPools.cpp b/src/server/game/Pools/QuestPools.cpp index f6e3bb121d2..f398986b489 100644 --- a/src/server/game/Pools/QuestPools.cpp +++ b/src/server/game/Pools/QuestPools.cpp @@ -292,5 +292,3 @@ bool QuestPoolMgr::IsQuestActive(uint32 questId) const return (it->second->activeQuests.find(questId) != it->second->activeQuests.end()); } - - diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 3069fcc80cf..3485c3aa8af 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -90,7 +90,6 @@ enum XPColorChar : uint8; #define VISIBLE_RANGE 166.0f //MAX visible range (size of grid) - /* @todo Add more script type classes. diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 103bd5e78d9..b4b22776e8f 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -1387,7 +1387,6 @@ bool WorldSession::DosProtection::EvaluateOpcode(WorldPacket& p, time_t time) co } } - uint32 WorldSession::DosProtection::GetMaxPacketCounterAllowed(uint16 opcode) const { uint32 maxPacketCounterAllowed; diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 60269226535..11fbc3c1805 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -1240,7 +1240,6 @@ class TC_GAME_API WorldSession // Packets cooldown time_t _calendarEventCreationCooldown; - WorldSession(WorldSession const& right) = delete; WorldSession& operator=(WorldSession const& right) = delete; }; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 0b18b840e5b..c82207ba36c 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -5732,7 +5732,6 @@ void AuraEffect::HandleRaidProcFromChargeAuraProc(AuraApplication* aurApp, ProcE target->CastSpell(target, triggerSpellId, { this, GetCasterGUID() }); } - void AuraEffect::HandleRaidProcFromChargeWithValueAuraProc(AuraApplication* aurApp, ProcEventInfo& /*eventInfo*/) { Unit* target = aurApp->GetTarget(); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 3cb8ee239dd..e40b4dc7ec3 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1442,7 +1442,6 @@ void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype) /* == gem perfection handling over == */ - /* == profession specialization handling == */ // init items_count to 1, since 1 item will be created regardless of specialization @@ -1462,7 +1461,6 @@ void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype) /* == profession specialization handling over == */ - // can the player store the new item? ItemPosCountVec dest; uint32 no_space = 0; @@ -2043,7 +2041,6 @@ void Spell::EffectSummonType(SpellEffIndex effIndex) if (m_originalCaster) caster = m_originalCaster; - bool personalSpawn = (properties->Flags & SUMMON_PROP_FLAG_PERSONAL_SPAWN) != 0; int32 duration = m_spellInfo->GetDuration(); if (Player* modOwner = caster->GetSpellModOwner()) diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index a36e4c7d57a..9b51e9f3a5c 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -3471,7 +3471,6 @@ bool _isPositiveEffectImpl(SpellInfo const* spellInfo, uint8 effIndex, std::unor return false; } - for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { switch (spellInfo->Effects[i].Effect) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index d7e8e8c57a6..805279b6774 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2583,7 +2583,6 @@ void SpellMgr::LoadSpellInfoStore() } } - TC_LOG_INFO("server.loading", ">> Loaded SpellInfo store in %u ms", GetMSTimeDiffToNow(oldMSTime)); } @@ -3525,7 +3524,6 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->Effects[EFFECT_0].SpellClassMask[0] |= 0x800; }); - // Crafty's Ultra-Advanced Proto-Typical Shortening Blaster ApplySpellFix({ 51912 }, [](SpellInfo* spellInfo) { diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index a617d7b57fa..0253d7014cd 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -97,7 +97,6 @@ enum SpellFamilyFlag SPELLFAMILYFLAG_SHAMAN_TOTEM_EFFECTS = 0x04000000 // Seems to be linked to most totems and some totem effects }; - #define SPELL_LINKED_MAX_SPELLS 200000 enum SpellLinkedType @@ -108,7 +107,6 @@ enum SpellLinkedType SPELL_LINK_REMOVE = 0 }; - // Spell proc event related declarations (accessed using SpellMgr functions) enum ProcFlags { diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp index 4ed4cfd5426..7de22b55398 100644 --- a/src/server/game/Warden/WardenWin.cpp +++ b/src/server/game/Warden/WardenWin.cpp @@ -43,7 +43,6 @@ static constexpr char _luaEvalPostfix[] = ",'GUILD')end"; static_assert((sizeof(_luaEvalPrefix)-1 + sizeof(_luaEvalMidfix)-1 + sizeof(_luaEvalPostfix)-1 + WARDEN_MAX_LUA_CHECK_LENGTH) == 255); - WardenWin::WardenWin() : Warden(), _serverTicks(0) { for (WardenCheckCategory category : EnumUtils::Iterate<WardenCheckCategory>()) diff --git a/src/server/scripts/Battlefield/BattlefieldWG.cpp b/src/server/scripts/Battlefield/BattlefieldWG.cpp index 8b33c154eb3..d13fadbf729 100644 --- a/src/server/scripts/Battlefield/BattlefieldWG.cpp +++ b/src/server/scripts/Battlefield/BattlefieldWG.cpp @@ -482,7 +482,6 @@ bool BattlefieldWG::SetupBattlefield() m_GraveyardList[i] = graveyard; } - Workshops.resize(WG_MAX_WORKSHOP); // Spawn workshop creatures and gameobjects for (uint8 i = 0; i < WG_MAX_WORKSHOP; i++) @@ -578,7 +577,6 @@ void BattlefieldWG::OnBattleStart() else TC_LOG_ERROR("bg.battlefield", "WG: Failed to spawn titan relic."); - // Update tower visibility and update faction for (auto itr = CanonList.begin(); itr != CanonList.end(); ++itr) { diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index 7117df396dd..cd92d182cbb 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -389,7 +389,6 @@ public: fields[0].GetCString(), fields[1].GetCString(), permanent ? handler->GetTrinityString(LANG_BANINFO_NEVER) : fields[2].GetCString(), permanent ? handler->GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), TimeFormat::ShortText).c_str(), fields[4].GetCString(), fields[5].GetCString()); - return true; } diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index d0b0f20a6d0..81eab255e26 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -666,7 +666,6 @@ public: } }; - void AddSC_list_commandscript() { new list_commandscript(); diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index d863fcc494d..2fd01bda598 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1654,8 +1654,6 @@ public: banReason = fields[3].GetString(); } - - // Can be used to query data from Characters database stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PINFO_XP); stmt->setUInt32(0, lowguid); diff --git a/src/server/scripts/Custom/custom_script_loader.cpp b/src/server/scripts/Custom/custom_script_loader.cpp index 1df319bc501..9e5e9ba2bfd 100644 --- a/src/server/scripts/Custom/custom_script_loader.cpp +++ b/src/server/scripts/Custom/custom_script_loader.cpp @@ -17,7 +17,6 @@ // This is where scripts' loading functions should be declared: - // The name of this function should match: // void Add${NameOfDirectory}Scripts() void AddCustomScripts() diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp index 5dfc1c5d6b6..0099406adee 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -225,7 +225,6 @@ class at_trigger_the_beast_movement : public AreaTriggerScript public: at_trigger_the_beast_movement() : AreaTriggerScript("at_trigger_the_beast_movement") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { if (player->IsGameMaster()) @@ -246,7 +245,6 @@ class at_the_beast_room : public AreaTriggerScript public: at_the_beast_room() : AreaTriggerScript("at_the_beast_room") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { if (player->IsGameMaster()) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index e7d1b1539f9..72883842491 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -47,7 +47,6 @@ enum Netherspite SPELL_NETHERSPITE_ROAR = 38684, }; - const float PortalCoord[3][3] = { {-11195.353516f, -1613.237183f, 278.237258f}, // Left side diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index aec4ec96ca9..5be3578763a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -124,7 +124,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (HellfireTimer) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index b0e3def2a95..cc824337359 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -1007,7 +1007,6 @@ enum JulianneRomulo ROMULO_Y = -1758, }; - enum RAJPhase { PHASE_JULIANNE = 0, diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 6bae4b7af91..8dab20baa03 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -422,7 +422,6 @@ public: #define SAY_DIALOG_ARCANAGOS_8 "What have you done, wizard? This cannot be! I'm burning from... within!" #define SAY_DIALOG_MEDIVH_9 "He should not have angered me. I must go... recover my strength now..." - static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f}; static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f}; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index a598bf18d49..6560973be5b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -245,8 +245,6 @@ Position const SummonPos[18] = { // Hall of Secrects - - // The Hall of the damned { 177.9624f, -68.23893f, 84.95197f, 3.228859f }, { 183.7705f, -61.43489f, 84.92424f, 5.148721f }, @@ -265,8 +263,6 @@ Position const SummonPos[18] = { 185.6157f, -42.91200f, 75.4812f, 4.45059f }, // Vault of the Ravenian - - }; enum Creatures diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index c737b926af1..51ba08eead4 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -470,7 +470,6 @@ class spell_apothecary_validate_area : public SpellScriptLoader targets.push_back(target); } - void HandleScript(SpellEffIndex /*effindex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_BUNNY_LOCKDOWN, true); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 942a5c18475..4f7e1c4a0e0 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -413,7 +413,6 @@ class npc_akilzon_eagle : public CreatureScript void MoveInLineOfSight(Unit* /*who*/) override { } - void MovementInform(uint32, uint32) override { arrived = true; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index bd62cd35b25..e7b185376c5 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -834,7 +834,6 @@ class boss_darkheart : public CreatureScript } }; - class boss_slither : public CreatureScript { public: diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 6297b3d51d3..879ecdc4dc4 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -349,7 +349,6 @@ class npc_harrison_jones : public CreatureScript } }; - void AddSC_zulaman() { new npc_zulaman_hostage(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 031622f4588..681fcfb95d6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -201,7 +201,6 @@ class npc_hearthsinger_forresten_cot : public CreatureScript } } - private: InstanceScript const* const _instance; EventMap _events; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 2027d4d4847..2ae3b7e4ca0 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -190,7 +190,6 @@ public: summons.Summon(summoned); } - void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 9d402d590d7..f20fabca27e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -83,7 +83,6 @@ public: _Reset(); } - void JustDied(Unit* /*killer*/) override { if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 8e33bbe0573..71b1fb44da0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -38,7 +38,6 @@ ObjectData const creatureData[] = { 0, 0 } // END }; - DoorData const doorData[] = { { AQ40_DOOR_1, DATA_SARTURA, DOOR_TYPE_PASSAGE }, diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 7b862a64a7e..1363c758a28 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -50,8 +50,6 @@ enum RuulSnowhoof SAY_FINISH = 0 }; - - Position const RuulSnowhoofSummonsCoord[6] = { { 3449.218018f, -587.825073f, 174.978867f, 4.714445f }, diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index d8a4fa39560..abe2d013d15 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -123,7 +123,6 @@ struct boss_volazj : public BossAI if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) damage = 0; - if ((GetHealthPct(0) >= 66 && GetHealthPct(damage) < 66)|| (GetHealthPct(0) >= 33 && GetHealthPct(damage) < 33)) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 69a9462501b..b711ba107a6 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1901,8 +1901,6 @@ class spell_halion_blazing_aura : public SpellScriptLoader } }; - - void AddSC_boss_halion() { new boss_halion(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 3dd6216da45..392522de2a9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -108,7 +108,6 @@ enum Misc POINT_SUMMONED = 1 }; - struct boss_jaraxxus : public BossAI { boss_jaraxxus(Creature* creature) : BossAI(creature, DATA_JARAXXUS) { } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 1c1d2bf59d7..2d0ad4ccbed 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -275,7 +275,6 @@ class npc_pit_of_saron_icicle : public CreatureScript } }; - class spell_pos_ice_shards : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index c8b960276fb..d19b952b705 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -1081,7 +1081,6 @@ class spell_putricide_unbound_plague : public SpellScript } } - targets.remove_if(Trinity::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster()))); Trinity::Containers::RandomResize(targets, 1); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index d05cc534405..dabd3ef350c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -129,7 +129,6 @@ enum Actions ACTION_ACQUIRE_TARGET }; - /* Room side checking logic */ static AreaBoundary* const livingSide = new RectangleBoundary(2633.84f, 2750.49f, -3434.0f, -3360.78f); static AreaBoundary* const deadSide = new RectangleBoundary(2633.84f, 2750.49f, -3360.78f, -3285.0f); @@ -166,7 +165,6 @@ static Player* FindEligibleTarget(Creature const* me, bool isGateOpen) return nullptr; } - /* Wave data */ typedef std::pair<uint32, uint8> GothikWaveEntry; // (npcEntry, npcCount) typedef std::set<GothikWaveEntry> GothikWave; @@ -291,7 +289,6 @@ const GothikWaveData waves25 = 0} }; - // GUID of first trigger NPC (used as offset for guid checks) // 0-1 are living side soul triggers, 2-3 are spectral side soul triggers, 4 is living rider spawn trigger, 5-7 are living other spawn trigger, 8-12 are skull pile triggers const uint32 CGUID_TRIGGER = 127618; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 236ccf7a042..e31c07fc482 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -497,7 +497,6 @@ class go_sapphiron_birth : public GameObjectScript } }; - class spell_sapphiron_change_blizzard_target : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index f998b7ba5e6..7f1c25fd6bb 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -122,7 +122,6 @@ enum PetMisc OVERLOAD_DISTANCE = 28 }; - //Thaddius enum ThaddiusYells { @@ -1243,7 +1242,6 @@ class achievement_thaddius_shocking : public AchievementCriteriaScript } }; - void AddSC_boss_thaddius() { RegisterNaxxramasCreatureAI(boss_thaddius); diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index 918fe62e218..dfcae04fc8d 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -212,7 +212,6 @@ enum NAXInstanceTexts SAY_DIALOGUE_SAPPHIRON_LICH_KING2 = 2 }; - template <class AI, class T> inline AI* GetNaxxramasAI(T* obj) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index fa0eb272cf9..a7967cdcda0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -505,7 +505,6 @@ struct npc_pummeller : public ScriptedAI return; } - if (Creature* xt002 = _instance->GetCreature(BOSS_XT002)) xt002->AI()->JustSummoned(me); @@ -616,7 +615,6 @@ private: TaskScheduler _scheduler; }; - struct npc_life_spark : public ScriptedAI { npc_life_spark(Creature* creature) : ScriptedAI(creature) { } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 10bf8aa79e2..a6306f2231a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -368,7 +368,6 @@ class spell_frost_tomb : public SpellScriptLoader } }; - class achievement_on_the_rocks : public AchievementCriteriaScript { public: diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 9b5b5a8cb4a..3448b9a3ee3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -72,7 +72,6 @@ class instance_utgarde_pinnacle : public InstanceMapScript LoadObjectData(creatureData, gameObjectData); } - void OnGameObjectCreate(GameObject* go) override { InstanceScript::OnGameObjectCreate(go); diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 21230347e80..74b4be75a9f 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -135,7 +135,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* killer) override { if (!killer || killer->GetTypeId() != TYPEID_PLAYER) @@ -267,7 +266,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) override { if (GameObject* go_caribou = ObjectAccessor::GetGameObject(*me, go_caribouGUID)) diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index ec4d7df9690..2091c630761 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -241,7 +241,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 8f3ce98422e..956aed1f29c 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -446,7 +446,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void JustSummoned(Creature* Summoned) override { Summons.Summon(Summoned); diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 7469dbccb1b..b0d846a8412 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -164,7 +164,6 @@ public: } }; - /*#### ## npc_released_offspring_harkoa ####*/ diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 92fc395c6f2..2fa84167245 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -37,7 +37,6 @@ uint32 const ZM_GRAVEYARD_ZONE = 3521; // linked when the central tower is controlled uint32 const ZM_GRAVEYARD_ID = 969; - // banners 182527, 182528, 182529, gotta check them ingame go_type const ZM_Banner_A = { 182527, 530, { 253.54f, 7083.81f, 36.7728f, -0.017453f }, { 0.0f, 0.0f, 0.008727f, -0.999962f } }; go_type const ZM_Banner_H = { 182528, 530, { 253.54f, 7083.81f, 36.7728f, -0.017453f }, { 0.0f, 0.0f, 0.008727f, -0.999962f } }; diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index 5515ebd1f11..52b66895bfe 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -89,7 +89,6 @@ enum Events EVENT_CHARGE_PLAYER }; - struct boss_gurtogg_bloodboil : public BossAI { boss_gurtogg_bloodboil(Creature* creature) : BossAI(creature, DATA_GURTOGG_BLOODBOIL) diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 5c9537f4442..ec7276ed0b7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -2127,7 +2127,6 @@ class spell_illidan_demon_transform1 : public AuraScript } }; - // 40398 - Demon Transform 2 class spell_illidan_demon_transform2 : public AuraScript { diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index cc8513282ef..3fb8d500063 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -238,7 +238,6 @@ private: bool _inCombat; }; - struct IllidariCouncilBossAI : public BossAI { IllidariCouncilBossAI(Creature* creature, uint32 bossId) : BossAI(creature, bossId), _bossId(bossId) diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index b99829c9072..35b01429684 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "black_temple.h" diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index c17a9c4bad2..709650ec541 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -760,7 +760,6 @@ class spell_reliquary_of_souls_submerge : public AuraScript GetTarget()->SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_STAND_STATE, UNIT_STAND_STATE_STAND); } - void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_reliquary_of_souls_submerge::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 47e3b10ebdb..ceaa4e6a2b7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -198,7 +198,6 @@ static float const MIDDLE_OF_ROOM = 400.0f; static float const FACE_THE_DOOR = 0.08726646f; static float const FACE_THE_PLATFORM = 3.118662f; - struct boss_shade_of_akama : public BossAI { boss_shade_of_akama(Creature* creature) : BossAI(creature, DATA_SHADE_OF_AKAMA) @@ -795,7 +794,6 @@ struct npc_ashtongue_defender : public ScriptedAI _events.ScheduleEvent(EVENT_WINDFURY, 8s, 12s); } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index a9357a71df8..939342d978a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -68,7 +68,6 @@ enum HydrossTheUnstable ENTRY_BEAM_DUMMY = 21934 }; - #define HYDROSS_X -239.439f #define HYDROSS_Y -363.481f diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 85d4f1d9a97..677ced1fafd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -75,8 +75,6 @@ enum LadyVashj #define SPOREBAT_Z 77.176567f #define SPOREBAT_O 5.223932f - - #define TEXT_NOT_INITIALIZED "Instance script not initialized" #define TEXT_ALREADY_DEACTIVATED "Already deactivated" @@ -610,7 +608,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (!VashjGUID) @@ -860,7 +857,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 415d8abc69c..d9b6c07e8b1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -46,7 +46,6 @@ enum Spells SPELL_SUBMERGE = 37550, SPELL_EMERGE = 20568, - // Ambusher spells SPELL_SPREAD_SHOT = 37790, SPELL_SHOOT = 37770, diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 22a380c7a9c..fc461700905 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -48,7 +48,6 @@ enum Misc MIN_KILLS = 30 }; - //NOTE: there are 6 platforms //there should be 3 shatterers and 2 priestess on all platforms, total of 30 elites, else it won't work! //delete all other elites not on platforms! these mobs should only be on those platforms nowhere else. diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp index 175f7571b18..7846ec41524 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp @@ -148,7 +148,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) override { } void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 282ec59ce7d..a5cf629d0f9 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -650,7 +650,6 @@ class npc_simon_bunny : public CreatureScript playableSequence.push_back(*i); } - // Remove any existant glowing auras over clusters and set clusters ready for interating with them. void PrepareClusters(bool clustersOnly = false) { diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp index e997691da51..9ee11397991 100644 --- a/src/server/scripts/Pet/pet_shaman.cpp +++ b/src/server/scripts/Pet/pet_shaman.cpp @@ -50,7 +50,6 @@ class npc_pet_shaman_earth_elemental : public CreatureScript { npc_pet_shaman_earth_elementalAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() override { _events.Reset(); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 724343fbf1a..d0db750f8f2 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1845,7 +1845,6 @@ class spell_dk_pestilence : public SpellScriptLoader } }; - // 48266 - Blood Presence // 48263 - Frost Presence // 48265 - Unholy Presence diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 066fa6ff192..2770aecfda6 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1789,7 +1789,6 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScript } }; - class spell_gen_gift_of_naaru : public AuraScript { PrepareAuraScript(spell_gen_gift_of_naaru); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index d3935e4b4a2..60e4d4b1f08 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -2730,7 +2730,6 @@ enum ReindeerTransformation SPELL_REINDEER_60 = 25858, }; - class spell_item_reindeer_transformation : public SpellScript { PrepareSpellScript(spell_item_reindeer_transformation); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 45975e49f1f..27a0da2fdc6 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -628,7 +628,6 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader { PrepareSpellScript(spell_pal_divine_storm_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_STORM_HEAL }); diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index 4963e421fc7..6e0c5eb1b27 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -550,7 +550,6 @@ public: } }; - class spell_warl_pet_scaling_04 : public SpellScriptLoader { public: @@ -827,7 +826,6 @@ public: } }; - class spell_sha_pet_scaling_04 : public SpellScriptLoader { public: @@ -1445,7 +1443,6 @@ public: } }; - class spell_dk_avoidance_passive : public SpellScriptLoader { public: diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index db49ca3f5c3..ea2808ca930 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -2132,7 +2132,6 @@ class spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death : public AuraSc } }; - class spell_q13264_q13276_q13288_q13289_area_restrict_abom : public SpellScript { PrepareSpellScript(spell_q13264_q13276_q13288_q13289_area_restrict_abom); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 710e2ae76c6..2452a0b8ff9 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -405,7 +405,6 @@ class spell_warr_execute : public SpellScriptLoader if (AuraEffect* aurEff = caster->GetAuraEffect(SPELL_WARRIOR_GLYPH_OF_EXECUTION, EFFECT_0)) rageUsed += aurEff->GetAmount() * 10; - int32 bp = GetEffectValue() + int32(rageUsed * spellInfo->Effects[effIndex].DamageMultiplier + caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.2f); CastSpellExtraArgs args(GetOriginalCaster()->GetGUID()); args.AddSpellBP0(bp); diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp index f3b5954efb1..4f207baa3c6 100644 --- a/src/server/scripts/World/action_ip_logger.cpp +++ b/src/server/scripts/World/action_ip_logger.cpp @@ -316,7 +316,6 @@ public: } }; - void AddSC_action_ip_logger() { new AccountActionIpLogger(); diff --git a/src/server/shared/SharedDefines.h b/src/server/shared/SharedDefines.h index 9c8a1767d47..055bf2c57fa 100644 --- a/src/server/shared/SharedDefines.h +++ b/src/server/shared/SharedDefines.h @@ -1427,7 +1427,6 @@ enum SpellImmunity MAX_SPELL_IMMUNITY }; - // target enum name consist of: // TARGET_[OBJECT_TYPE]_[REFERENCE_TYPE(skipped for caster)]_[SELECTION_TYPE(skipped for default)]_[additional specifiers(friendly, BACK_LEFT, etc.] enum Targets diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 6993bf73c34..6a51d91b9db 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2898,7 +2898,6 @@ Arena.ArenaWinRatingModifier1 = 48 Arena.ArenaWinRatingModifier2 = 24 - # # Arena.ArenaLoseRatingModifier # Description: Modifier of rating subtraction for loser team diff --git a/src/tools/mmaps_generator/Info/readme.txt b/src/tools/mmaps_generator/Info/readme.txt index bde8e61b080..4f85efd63e3 100644 --- a/src/tools/mmaps_generator/Info/readme.txt +++ b/src/tools/mmaps_generator/Info/readme.txt @@ -53,7 +53,6 @@ Generator command line args this command will build the map regardless of --skip* option settings if you do not specify a map number, builds all maps that pass the filters specified by --skip* options - examples: movement_extractor diff --git a/src/tools/mmaps_generator/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp index 56d5066be2c..633e4de80e0 100644 --- a/src/tools/mmaps_generator/IntermediateValues.cpp +++ b/src/tools/mmaps_generator/IntermediateValues.cpp @@ -233,7 +233,6 @@ namespace MMAP fclose(objFile); - char tileString[25]; sprintf(tileString, "[%02u,%02u]: ", tileY, tileX); printf("%sWriting debug output... \r", tileString); diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index c214c2618ac..5cbc31959ac 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -425,7 +425,6 @@ namespace MMAP useLiquid = false; } - // if there is no terrain, don't use terrain if (!ttriangles.size()) useTerrain = false; diff --git a/src/tools/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h index 2f3f453a854..7290aba8c5d 100644 --- a/src/tools/vmap4_extractor/adtfile.h +++ b/src/tools/vmap4_extractor/adtfile.h @@ -50,7 +50,6 @@ namespace ADT } #pragma pack(pop) - class ADTFile { private: diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp index ebb37ba2cde..05e0d09df8f 100644 --- a/src/tools/vmap4_extractor/model.cpp +++ b/src/tools/vmap4_extractor/model.cpp @@ -133,7 +133,6 @@ bool Model::ConvertToVMAPModel(const char * outfilename) return true; } - Vec3D fixCoordSystem(Vec3D const& v) { return Vec3D(v.x, v.z, -v.y); @@ -263,4 +262,3 @@ void Doodad::ExtractSet(WMODoodadData const& doodadData, ADT::MODF const& wmo, u fwrite(ModelInstName, sizeof(char), nlen, pDirfile); } } - diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index d08c6bb0e79..8c0e59e8f9d 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -388,7 +388,6 @@ bool processArgv(int argc, char ** argv, const char *versionString) return result; } - //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx // Main // diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index 360cf24fd2e..13900f9b80d 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -571,5 +571,4 @@ void MapObject::Extract(ADT::MODF const& mapObjDef, char const* WmoInstName, uin fwrite(&nlen, sizeof(uint32), 1, pDirfile); fwrite(WmoInstName, sizeof(char), nlen, pDirfile); - } |