diff options
author | click <click@gonnamakeyou.com> | 2011-02-27 18:34:24 +0100 |
---|---|---|
committer | click <click@gonnamakeyou.com> | 2011-02-27 18:34:24 +0100 |
commit | d92fb9ad65b06ba9afac231964575219d4df1df1 (patch) | |
tree | 16dbfebcd5839576fd5edde8c59702e2ed9ec5f0 | |
parent | da773981f8b7e8d1debb5b54a94dd6c173fb2f96 (diff) |
Core: Clean up some rogue whitespace and tabs
-rwxr-xr-x | src/server/game/AI/CoreAI/UnitAI.h | 2 | ||||
-rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 2 | ||||
-rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 16 | ||||
-rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.cpp | 6 | ||||
-rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.h | 2 | ||||
-rwxr-xr-x | src/server/game/Maps/Map.cpp | 4 | ||||
-rwxr-xr-x | src/server/game/Server/Protocol/Handlers/PetHandler.cpp | 2 | ||||
-rwxr-xr-x | src/server/game/Server/WorldSession.cpp | 2 | ||||
-rwxr-xr-x | src/server/game/Server/WorldSocket.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp | 10 | ||||
-rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp | 6 | ||||
-rw-r--r-- | src/server/scripts/World/guards.cpp | 20 |
12 files changed, 37 insertions, 37 deletions
diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 262adfb927c..fb3c1e97ee7 100755 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -204,7 +204,7 @@ class UnitAI { // Already sorted if (!maxTargets || maxTargets >= targetList.size()) // Do not filter - return; + return; std::list<Unit*>::iterator itr = targetList.begin(); advance(itr, maxTargets); diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 780b07b6352..1e4e86b9d48 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -452,7 +452,7 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID, if (WaypointList.empty()) { - sLog->outErrorDb("TSCR: EscortAI (script: %s, creature entry: %u) starts with 0 waypoints (possible missing entry in script_waypoint. Quest: %u).", + sLog->outErrorDb("TSCR: EscortAI (script: %s, creature entry: %u) starts with 0 waypoints (possible missing entry in script_waypoint. Quest: %u).", me->GetScriptName().c_str(), me->GetEntry(), pQuest ? pQuest->GetQuestId() : 0); return; } diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 4abf17049b2..3ad48d1421f 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -146,7 +146,7 @@ void SmartScript::ProcessAction(SmartScriptHolder &e, Unit* unit, uint32 var0, u mUseTextTimer = true; sCreatureTextMgr->SendChat(talker, uint8(e.action.talk.textGroupID), mTextGUID); - sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: %s (GuidLow: %u), textGuid: %u", + sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: %s (GuidLow: %u), textGuid: %u", talker->GetName(), talker->GetGUIDLow(), mTextGUID); break; @@ -179,7 +179,7 @@ void SmartScript::ProcessAction(SmartScriptHolder &e, Unit* unit, uint32 var0, u if (IsUnit((*itr))) { (*itr)->ToUnit()->HandleEmoteCommand(e.action.emote.emote); - sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_PLAY_EMOTE: target: %s (GuidLow: %u), emote: %u", + sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_PLAY_EMOTE: target: %s (GuidLow: %u), emote: %u", (*itr)->GetName(), (*itr)->GetGUIDLow(), e.action.emote.emote); } break; @@ -192,8 +192,8 @@ void SmartScript::ProcessAction(SmartScriptHolder &e, Unit* unit, uint32 var0, u if (IsCreature((*itr))) { sCreatureTextMgr->SendSound((*itr)->ToCreature(), e.action.sound.sound, CHAT_TYPE_SAY, 0, TextRange(e.action.sound.range), Team(NULL), false); - sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SOUND: source: %s (GuidLow: %u), sound: %u, range: %u", - (*itr)->GetName(), (*itr)->GetGUIDLow(), e.action.sound.sound, e.action.sound.range); + sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SOUND: source: %s (GuidLow: %u), sound: %u, range: %u", + (*itr)->GetName(), (*itr)->GetGUIDLow(), e.action.sound.sound, e.action.sound.range); } break; } @@ -539,7 +539,7 @@ void SmartScript::ProcessAction(SmartScriptHolder &e, Unit* unit, uint32 var0, u bool move = e.action.combatMove.move ? true : false; CAST_AI(SmartAI, me->AI())->SetCombatMove(move); - sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ALLOW_COMBAT_MOVEMENT: Creature %u bool on = %u", + sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ALLOW_COMBAT_MOVEMENT: Creature %u bool on = %u", me->GetGUIDLow(), e.action.combatMove.move); break; } @@ -668,7 +668,7 @@ void SmartScript::ProcessAction(SmartScriptHolder &e, Unit* unit, uint32 var0, u uint32 phase = temp[urand(0, count)]; SetPhase(phase); sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_RANDOM_PHASE: Creature %u sets event phase to %u", - me->GetGUIDLow(), phase); + me->GetGUIDLow(), phase); break; } case SMART_ACTION_RANDOM_PHASE_RANGE: @@ -1444,9 +1444,9 @@ void SmartScript::ProcessAction(SmartScriptHolder &e, Unit* unit, uint32 var0, u case SMART_ACTION_INTERRUPT_SPELL: { ObjectList* targets = GetTargets(e, unit); - if (!targets) + if (!targets) return; - + for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); itr++) { if (IsUnit((*itr))) diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 58137aae7d6..74006d55b2f 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -27,7 +27,7 @@ #include "CreatureAI.h" #include "ZoneScript.h" -Vehicle::Vehicle(Unit *unit, VehicleEntry const *vehInfo, uint32 creatureEntry) +Vehicle::Vehicle(Unit *unit, VehicleEntry const *vehInfo, uint32 creatureEntry) : me(unit), m_vehicleInfo(vehInfo), m_usableSeatNum(0), m_bonusHP(0), m_creatureEntry(creatureEntry) { for (uint32 i = 0; i < MAX_VEHICLE_SEATS; ++i) @@ -285,11 +285,11 @@ void Vehicle::InstallAccessory(uint32 entry, int8 seatId, bool minion, uint8 typ if (minion) accessory->AddUnitTypeMask(UNIT_MASK_ACCESSORY); - + if (!me->HandleSpellClick(accessory, seatId)) { sLog->outErrorDb("Vehicle entry %u in vehicle_accessory does not have a valid record in npc_spellclick_spells! Calling default EnterVehicle()", - m_creatureEntry); + m_creatureEntry); accessory->EnterVehicle(this, seatId); } diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 8b2acf9954e..16ff0cad7f2 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -86,7 +86,7 @@ struct VehicleSeat struct VehicleAccessory { - explicit VehicleAccessory(uint32 _uiAccessory, int8 _uiSeat, bool _bMinion, uint8 _uiSummonType, uint32 _uiSummonTime) : + explicit VehicleAccessory(uint32 _uiAccessory, int8 _uiSeat, bool _bMinion, uint8 _uiSummonType, uint32 _uiSummonTime) : uiAccessory(_uiAccessory), uiSeat(_uiSeat), bMinion(_bMinion), uiSummonType(_uiSummonType), uiSummonTime(_uiSummonTime) {} uint32 uiAccessory; int8 uiSeat; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 5e7ee93a989..46cb52f6b00 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2531,8 +2531,8 @@ void InstanceMap::SetResetSchedule(bool on, Player* player) if (InstanceSave *save = sInstanceSaveMgr->GetInstanceSave(GetInstanceId())) sInstanceSaveMgr->ScheduleReset(on, save->GetResetTime(), InstanceSaveManager::InstResetEvent(0, GetId(), Difficulty(GetSpawnMode()), GetInstanceId())); else - sLog->outError("InstanceMap::SetResetSchedule: cannot turn schedule %s, there is no save information for instance (map [id: %u, name: %s], instance id: %u) due to player (GUID: %u, name: %s) %s", - on ? "on" : "off", GetId(), GetMapName(), GetInstanceId(), + sLog->outError("InstanceMap::SetResetSchedule: cannot turn schedule %s, there is no save information for instance (map [id: %u, name: %s], instance id: %u) due to player (GUID: %u, name: %s) %s", + on ? "on" : "off", GetId(), GetMapName(), GetInstanceId(), player->GetGUIDLow(), player->GetName(), on ? "leave" : "entrance"); } } diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp index 83d3c1db28c..5ad3889ba2d 100755 --- a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp @@ -141,7 +141,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid CharmInfo *charmInfo = pet->GetCharmInfo(); if (!charmInfo) { - sLog->outError("WorldSession::HandlePetAction(petGuid: " UI64FMTD ", tagGuid: " UI64FMTD ", spellId: %u, flag: %u): object (entry: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", + sLog->outError("WorldSession::HandlePetAction(petGuid: " UI64FMTD ", tagGuid: " UI64FMTD ", spellId: %u, flag: %u): object (entry: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", guid1, guid2, spellid, flag, pet->GetGUIDLow(), pet->GetTypeId()); return; } diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 8a9c43477b4..d4e34ad870f 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -192,7 +192,7 @@ void WorldSession::QueuePacket(WorldPacket *new_packet) void WorldSession::LogUnexpectedOpcode(WorldPacket *packet, const char* status, const char *reason) { sLog->outError("SESSION (account: %u, guidlow: %u, char: %s): received unexpected opcode %s (0x%.4X, status: %s) %s", - GetAccountId(), m_GUIDLow, _player ? _player->GetName() : "<none>", + GetAccountId(), m_GUIDLow, _player ? _player->GetName() : "<none>", LookupOpcodeName(packet->GetOpcode()), packet->GetOpcode(), status, reason); } diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index e20430ee164..f1ea340cd4b 100755 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -498,7 +498,7 @@ int WorldSocket::handle_input_header (void) sLog->outError ("WorldSocket::handle_input_header(): client (account: %u, char [GUID: %u, name: %s]) sent malformed packet (size: %d , cmd: %d)", m_Session ? m_Session->GetAccountId() : 0, _player ? _player->GetGUIDLow() : 0, - _player ? _player->GetName() : "<none>", + _player ? _player->GetName() : "<none>", header.size, header.cmd); errno = EINVAL; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index ef3daa406b9..24c4f63cb0c 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -120,7 +120,7 @@ class boss_kologarn : public CreatureScript void EnterCombat(Unit * who) { DoScriptText(SAY_AGGRO, me); - + events.ScheduleEvent(EVENT_MELEE_CHECK, 6000); events.ScheduleEvent(EVENT_SMASH, 5000); events.ScheduleEvent(EVENT_SWEEP, 19000); @@ -138,7 +138,7 @@ class boss_kologarn : public CreatureScript void Reset() { _Reset(); - eyebeamTarget = 0; + eyebeamTarget = 0; } void JustDied(Unit * /*victim*/) @@ -188,7 +188,7 @@ class boss_kologarn : public CreatureScript return; who->CastSpell(me, SPELL_ARM_DEAD_DAMAGE, true); - + if (Creature* rubbleStalker = who->FindNearestCreature(NPC_RUBBLE_STALKER, 70.0f)) { if (rubbleStalker) @@ -233,7 +233,7 @@ class boss_kologarn : public CreatureScript summon->SetReactState(REACT_PASSIVE); summon->SetFlag(UNIT_FIELD_ATTACK_POWER, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED); // One of the above spells is a channeled spell, we need to clear this unit state for MoveChase to work - summon->ClearUnitState(UNIT_STAT_CASTING); + summon->ClearUnitState(UNIT_STAT_CASTING); // Victim gets 67351 if (eyebeamTarget) @@ -294,7 +294,7 @@ class boss_kologarn : public CreatureScript case EVENT_RESPAWN_RIGHT_ARM: { if (Creature* arm = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_RIGHT_ARM) : 0)) - RespawnArm(arm->ToCreature()); + RespawnArm(arm->ToCreature()); events.CancelEvent(EVENT_RESPAWN_RIGHT_ARM); break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index cc709913406..c4538abffd9 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -166,14 +166,14 @@ public: // The below hacks are courtesy of the grid/visibilitysystem if (GetBossState(TYPE_KOLOGARN) == DONE) { - creature->SetDeadByDefault(true); - creature->setDeathState(CORPSE); + creature->SetDeadByDefault(true); + creature->setDeathState(CORPSE); creature->DestroyForNearbyPlayers(); creature->UpdateObjectVisibility(true); } else { - creature->SetDeadByDefault(false); + creature->SetDeadByDefault(false); creature->setDeathState(CORPSE); creature->RemoveCorpse(true); } diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 107ada81863..f3f7bd27720 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Guards SD%Complete: 100 -SDComment: +SDComment: SDCategory: Guards EndScriptData */ @@ -35,7 +35,7 @@ EndContentData */ enum GuardGeneric { GENERIC_CREATURE_COOLDOWN = 5000, - + SAY_GUARD_SIL_AGGRO1 = -1070001, SAY_GUARD_SIL_AGGRO2 = -1070002, SAY_GUARD_SIL_AGGRO3 = -1070003, @@ -118,9 +118,9 @@ public: info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING); //No healing spell available, select a hostile spell - if (info) + if (info) healing = true; - else + else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); //20% chance to replace our white hit with a spell @@ -129,13 +129,13 @@ public: //Cast the spell if (healing) DoCast(me, info->Id); - else + else DoCast(me->getVictim(), info->Id); //Set our global cooldown globalCooldown = GENERIC_CREATURE_COOLDOWN; } - else + else me->AttackerStateUpdate(me->getVictim()); me->resetAttackTimer(); @@ -154,7 +154,7 @@ public: info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING); //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE) - if (info) + if (info) healing = true; else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE); @@ -170,9 +170,9 @@ public: } //Cast spell - if (healing) + if (healing) DoCast(me,info->Id); - else + else DoCast(me->getVictim(),info->Id); //Set our global cooldown @@ -204,7 +204,7 @@ public: case TEXTEMOTE_CHICKEN: me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); break; } } - + void ReceiveEmote(Player* player, uint32 textEmote) { switch(me->GetEntry()) |