Skip to content

Commit

Permalink
Core/Misc: Remove whitespace at the end of lines
Browse files Browse the repository at this point in the history
  • Loading branch information
jackpoz committed Apr 5, 2020
1 parent 0017c7a commit caae388
Show file tree
Hide file tree
Showing 34 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion src/common/Cryptography/Argon2.h
Expand Up @@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef TRINITY_ARGON2_H
#define TRINITY_ARGON2_H

Expand Down
2 changes: 1 addition & 1 deletion src/common/Cryptography/CryptoGenerics.h
Expand Up @@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef TRINITY_CRYPTO_GENERICS_HPP
#define TRINITY_CRYPTO_GENERICS_HPP

Expand Down
2 changes: 1 addition & 1 deletion src/common/Encoding/Base32.h
Expand Up @@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef TRINITY_BASE32_H
#define TRINITY_BASE32_H

Expand Down
2 changes: 1 addition & 1 deletion src/common/Encoding/Base64.h
Expand Up @@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef TRINITY_BASE64_H
#define TRINITY_BASE64_H

Expand Down
2 changes: 1 addition & 1 deletion src/common/Encoding/BaseEncoding.h
Expand Up @@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef TRINITY_BASE_ENCODING_HPP
#define TRINITY_BASE_ENCODING_HPP

Expand Down
Expand Up @@ -315,7 +315,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_DEL_CORPSE, "DELETE FROM corpse WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_CORPSES_FROM_MAP, "DELETE FROM corpse WHERE mapId = ? AND instanceId = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_SEL_CORPSE_LOCATION, "SELECT mapId, posX, posY, posZ, orientation FROM corpse WHERE guid = ?", CONNECTION_ASYNC);

// Respawns
PrepareStatement(CHAR_SEL_RESPAWNS, "SELECT type, spawnId, respawnTime FROM respawn WHERE mapId = ? AND instanceId = ?", CONNECTION_SYNCH);
PrepareStatement(CHAR_REP_RESPAWN, "REPLACE INTO respawn (type, spawnId, respawnTime, mapId, instanceId) VALUES (?, ?, ?, ?, ?)", CONNECTION_ASYNC);
Expand Down
Expand Up @@ -261,7 +261,7 @@ enum CharacterDatabaseStatements : uint32
CHAR_DEL_CORPSE,
CHAR_DEL_CORPSES_FROM_MAP,
CHAR_SEL_CORPSE_LOCATION,

CHAR_SEL_RESPAWNS,
CHAR_REP_RESPAWN,
CHAR_DEL_RESPAWN,
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/AI/CoreAI/PetAI.cpp
Expand Up @@ -419,7 +419,7 @@ void PetAI::DoAttack(Unit* target, bool chase)

if (me->HasUnitState(UNIT_STATE_FOLLOW))
me->GetMotionMaster()->Remove(FOLLOW_MOTION_TYPE);

// Pets with ranged attacks should not care about the chase angle at all.
float chaseDistance = me->GetPetChaseDistance();
float angle = chaseDistance == 0.f ? float(M_PI) : 0.f;
Expand Down
6 changes: 3 additions & 3 deletions src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
Expand Up @@ -83,7 +83,7 @@ void EscortAI::InitializeAI()

if (me->GetFaction() != me->GetCreatureTemplate()->faction)
me->RestoreFaction();

Reset();
}

Expand All @@ -97,7 +97,7 @@ void EscortAI::EnterEvadeMode(EvadeReason /*why*/)
me->RemoveAllAuras();
me->CombatStop(true);
me->SetLootRecipient(nullptr);

EngagementOver();

if (HasEscortState(STATE_ESCORT_ESCORTING))
Expand Down Expand Up @@ -300,7 +300,7 @@ void EscortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false */,
}

_running = run;

if (!_manualPath && resetWaypoints)
FillPointMovementListForCreature();

Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Chat/Channels/Channel.h
Expand Up @@ -223,7 +223,7 @@ 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
{
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Chat/HyperlinkTags.cpp
Expand Up @@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "Hyperlinks.h"
#include "AchievementMgr.h"
#include "ObjectMgr.h"
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Chat/Hyperlinks.cpp
Expand Up @@ -355,7 +355,7 @@ bool Trinity::Hyperlinks::CheckAllLinks(std::string const& str)
return false;
}
}

// Step 2: Parse all link sequences
// They look like this: |c<color>|H<linktag>:<linkdata>|h[<linktext>]|h|r
// - <color> is 8 hex characters AARRGGBB
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/DungeonFinding/LFGMgr.cpp
Expand Up @@ -626,7 +626,7 @@ void LFGMgr::LeaveLfg(ObjectGuid guid, bool disconnected)
// This is required in case a LFG group vote-kicks a player in a dungeon, queues, then leaves the queue (maybe to queue later again)
if (Group* group = sGroupMgr->GetGroupByGUID(gguid.GetCounter()))
if (group->isLFGGroup() && GetDungeon(gguid) && (oldState == LFG_STATE_DUNGEON || oldState == LFG_STATE_FINISHED_DUNGEON))
newState = oldState;
newState = oldState;

LFGQueue& queue = GetQueue(gguid);
queue.RemoveFromQueue(gguid);
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Globals/ObjectMgr.cpp
Expand Up @@ -363,7 +363,7 @@ void ObjectMgr::LoadCreatureTemplates()
// 5. Select "Number to Insert", Initial number 1, Increase by 1
// 6. Run this regex
// a.find "\/\/[ ]+
// b.replace "\r\n\t\t\/\/
// b.replace "\r\n\t\t\/\/ (not that there is a space at the end of the regex, it's needed)

QueryResult result = WorldDatabase.Query(
// 0
Expand Down
4 changes: 2 additions & 2 deletions src/server/game/Handlers/BattleGroundHandler.cpp
Expand Up @@ -137,7 +137,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData)
GetPlayer()->SendDirectMessage(&data);
return;
}

// check RBAC permissions
if (!_player->CanJoinToBattleground(bg))
{
Expand Down Expand Up @@ -680,7 +680,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket& recvData)
_player->SendDirectMessage(&data);
return;
}

if (!_player->CanJoinToBattleground(bg))
{
WorldPacket data;
Expand Down
6 changes: 3 additions & 3 deletions src/server/game/OutdoorPvP/OutdoorPvP.cpp
Expand Up @@ -174,7 +174,7 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
TC_LOG_DEBUG("outdoorpvp", "deleting opvp creature type %u", type);
m_CreatureTypes[m_Creatures[type]] = 0;
m_Creatures[type] = 0;

return Creature::DeleteFromDB(spawnId);
}

Expand All @@ -183,10 +183,10 @@ bool OPvPCapturePoint::DelObject(uint32 type)
uint32 spawnId = m_Objects[type];
if (!spawnId)
return false;

m_ObjectTypes[m_Objects[type]] = 0;
m_Objects[type] = 0;

return GameObject::DeleteFromDB(spawnId);
}

Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Server/Packets/CombatPackets.h
Expand Up @@ -36,7 +36,7 @@ namespace WorldPackets

ObjectGuid Victim;
};

class AttackSwingNotInRange final : public ServerPacket
{
public:
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Server/Packets/MiscPackets.h
Expand Up @@ -142,7 +142,7 @@ namespace WorldPackets

ObjectGuid SourceObjectGUID;
uint32 SoundKitID = 0;

};

class TC_GAME_API PlaySound final : public ServerPacket
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Server/Packets/TotemPackets.h
Expand Up @@ -46,7 +46,7 @@ namespace WorldPackets
ObjectGuid Totem;
uint32 Duration = 0;
uint32 SpellID = 0;

};
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Spells/Auras/SpellAuraEffects.cpp
Expand Up @@ -3910,7 +3910,7 @@ void AuraEffect::HandleModCastingSpeed(AuraApplication const* aurApp, uint8 mode

if (spellGroupVal)
target->ApplyCastTimePercentMod(float(spellGroupVal), !apply);

target->ApplyCastTimePercentMod((float)GetAmount(), apply);
}

Expand Down
4 changes: 2 additions & 2 deletions src/server/game/World/World.cpp
Expand Up @@ -972,14 +972,14 @@ void World::LoadConfigSettings(bool reload)
m_bool_configs[CONFIG_CAST_UNSTUCK] = sConfigMgr->GetBoolDefault("CastUnstuck", true);
m_int_configs[CONFIG_INSTANCE_RESET_TIME_HOUR] = sConfigMgr->GetIntDefault("Instance.ResetTimeHour", 4);
m_int_configs[CONFIG_INSTANCE_UNLOAD_DELAY] = sConfigMgr->GetIntDefault("Instance.UnloadDelay", 30 * MINUTE * IN_MILLISECONDS);

m_int_configs[CONFIG_DAILY_QUEST_RESET_TIME_HOUR] = sConfigMgr->GetIntDefault("Quests.DailyResetTime", 3);
if (m_int_configs[CONFIG_DAILY_QUEST_RESET_TIME_HOUR] > 23)
{
TC_LOG_ERROR("server.loading", "Quests.DailyResetTime (%i) must be in range 0..23. Set to 3.", m_int_configs[CONFIG_DAILY_QUEST_RESET_TIME_HOUR]);
m_int_configs[CONFIG_DAILY_QUEST_RESET_TIME_HOUR] = 3;
}

m_int_configs[CONFIG_WEEKLY_QUEST_RESET_TIME_WDAY] = sConfigMgr->GetIntDefault("Quests.WeeklyResetWDay", 3);
if (m_int_configs[CONFIG_WEEKLY_QUEST_RESET_TIME_WDAY] > 6)
{
Expand Down
2 changes: 1 addition & 1 deletion src/server/scripts/Commands/cs_account.cpp
Expand Up @@ -840,7 +840,7 @@ class account_commandscript : public CommandScript
handler->SetSentErrorMessage(true);
return false;
}

Optional<std::vector<uint8>> decoded = Trinity::Encoding::Base32::Decode(secret);
if (!decoded)
{
Expand Down
2 changes: 1 addition & 1 deletion src/server/scripts/Commands/cs_misc.cpp
Expand Up @@ -1264,7 +1264,7 @@ class misc_commandscript : public CommandScript
if (count < 0)
{
uint32 destroyedItemCount = playerTarget->DestroyItemCount(itemId, -count, true, false);

if (destroyedItemCount > 0)
{
// output the amount of items successfully destroyed
Expand Down
Expand Up @@ -113,13 +113,13 @@ class instance_blackwing_lair : public InstanceMapScript
{
InstanceScript::OnGameObjectCreate(go);

switch(go->GetEntry())
switch(go->GetEntry())
{
case GO_BLACK_DRAGON_EGG:
if (GetBossState(DATA_FIREMAW) == DONE)
go->SetPhaseMask(2, true);
else
EggList.push_back(go->GetGUID());
EggList.push_back(go->GetGUID());
break;
default:
break;
Expand Down
Expand Up @@ -1389,7 +1389,7 @@ class npc_highlord_darion_mograine : public CreatureScript
me->CombatStop(true);
me->InterruptNonMeleeSpells(false);
me->SetWalk(false);

EngagementOver();

for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
Expand Down
Expand Up @@ -423,9 +423,9 @@ void hyjalAI::EnterEvadeMode(EvadeReason /*why*/)
if (me->GetEntry() != JAINA)
me->RemoveAllAuras();
me->CombatStop(true);

EngagementOver();

me->LoadCreaturesAddon();
if (me->IsAlive())
me->GetMotionMaster()->MoveTargetedHome();
Expand Down
4 changes: 2 additions & 2 deletions src/server/scripts/Kalimdor/zone_desolace.cpp
Expand Up @@ -88,9 +88,9 @@ class npc_aged_dying_ancient_kodo : public CreatureScript
me->CombatStop();
me->SetFaction(FACTION_FRIENDLY);
me->SetSpeedRate(MOVE_RUN, 0.6f);

EngagementOver();

me->GetMotionMaster()->MoveFollow(caster, PET_FOLLOW_DIST, me->GetFollowAngle());
me->setActive(true);
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
Expand Down
4 changes: 2 additions & 2 deletions src/server/scripts/Kalimdor/zone_the_barrens.cpp
Expand Up @@ -184,9 +184,9 @@ class npc_taskmaster_fizzule : public CreatureScript
me->RemoveAllAuras();
me->CombatStop(true);
me->StopMoving();

EngagementOver();

me->GetMotionMaster()->MoveIdle();
me->SetFaction(FACTION_FRIENDLY);
me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
Expand Down
2 changes: 1 addition & 1 deletion src/server/scripts/Northrend/zone_dragonblight.cpp
Expand Up @@ -571,7 +571,7 @@ class npc_wyrmrest_defender : public CreatureScript
}
return true;
}

void OnCharmed(bool /*apply*/) override
{
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
Expand Down
2 changes: 1 addition & 1 deletion src/server/scripts/Spells/spell_quest.cpp
Expand Up @@ -1994,7 +1994,7 @@ enum BurstAtTheSeams
{
AREA_THE_BROKEN_FRONT = 4507,
AREA_MORD_RETHAR_THE_DEATH_GATE = 4508,

NPC_DRAKKARI_CHIEFTAINK = 29099,
NPC_ICY_GHOUL = 31142,
NPC_VICIOUS_GEIST = 31147,
Expand Down
4 changes: 2 additions & 2 deletions src/server/scripts/World/go_scripts.cpp
Expand Up @@ -1868,7 +1868,7 @@ class go_bells : public GameObjectScript
_soundId = BELLTOLLHORDE; // undead bell sound
break;
default:
_soundId = BELLTOLLTRIBAL; // orc drum sound
_soundId = BELLTOLLTRIBAL; // orc drum sound
break;
}
break;
Expand All @@ -1887,7 +1887,7 @@ class go_bells : public GameObjectScript
_soundId = BELLTOLLNIGHTELF; // nightelf bell sound
break;
default:
_soundId = BELLTOLLALLIANCE; // human bell sound
_soundId = BELLTOLLALLIANCE; // human bell sound
}
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/scripts/World/npcs_special.cpp
Expand Up @@ -180,7 +180,7 @@ class npc_air_force_bots : public CreatureScript
AirForceSpawn const& _spawn;
ObjectGuid _myGuard;
std::unordered_set<ObjectGuid> _toAttack;

};

CreatureAI* GetAI(Creature* creature) const override
Expand Down
2 changes: 1 addition & 1 deletion src/server/shared/Secrets/SecretMgr.h
Expand Up @@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef __TRINITY_SECRETMGR_H__
#define __TRINITY_SECRETMGR_H__

Expand Down
4 changes: 2 additions & 2 deletions src/server/worldserver/worldserver.conf.dist
Expand Up @@ -1123,7 +1123,7 @@ MinQuestScaledXPRatio = 0

#
# MinCreatureScaledXPRatio
# Description: Min ratio of experience that a creature kill can grant when player level scaling is factored. This
# Description: Min ratio of experience that a creature kill can grant when player level scaling is factored. This
# will also allow spell procs to trigger, such as Drain Soul, if > 0 and exp is grantable.
# Example: 50 (No less than 50% experience granted from a lower leveled creature kill)
# 100 (Creature kills always grant full experience upon kill)
Expand Down Expand Up @@ -1292,7 +1292,7 @@ BirthdayTime = 1222964635

#
# CacheDataQueries
# Description: Server caches data queries at startup.
# Description: Server caches data queries at startup.
# Can be disabled if not enough memory is available.
# Default: 1 - (Enabled)
# 0 - (Disabled)
Expand Down

0 comments on commit caae388

Please sign in to comment.