diff options
author | Kargatum <dowlandtop@yandex.com> | 2021-01-03 17:47:07 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-03 11:47:07 +0100 |
commit | a32b6b8ac4c81128a56b282f20837fb085bdd9e7 (patch) | |
tree | dc78724705a27ed8032372f73fbf5b318abbd630 /src/server/game/Entities | |
parent | 4ea64b515aa952662dce11fd1012c566ae0d2449 (diff) |
Core: whitespace cleanup, reduce double blank line to single (#25795)
* Core/Misc: fix double empty line
* worldserver.conf
Diffstat (limited to 'src/server/game/Entities')
-rw-r--r-- | src/server/game/Entities/Corpse/Corpse.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Entities/Item/ItemTemplate.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Entities/Player/EquipmentSet.h | 1 | ||||
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Entities/Player/Player.h | 1 | ||||
-rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.cpp | 1 |
9 files changed, 0 insertions, 12 deletions
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; |