josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Clean up whitespace and tabs in the base sourcetree

Browse Source
This commit is contained in:
click
2012-02-18 16:52:08 +01:00
parent da5027ef3a
commit 5411e1ce52
63 changed files with 143 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/collision/DynamicTree.h
+1 -1
View File
@@ -16,7 +16,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _DYNTREE_H
#define _DYNTREE_H
src/server/collision/Maps/TileAssembler.cpp
+9 -9
View File
@@ -258,7 +258,7 @@ namespace VMAP
uint32 groups = raw_model.groupsArray.size();
if (groups != 1)
printf("Warning: '%s' does not seem to be a M2 model!\n", modelFilename.c_str());
AABox modelBound;
bool boundEmpty=true;
@@ -308,7 +308,7 @@ namespace VMAP
WorldModel_Raw raw_model;
if (!raw_model.Read(filename.c_str()))
return false;
// write WorldModel
WorldModel model;
model.setRootWmoID(raw_model.RootWMOID);
@@ -327,12 +327,12 @@ namespace VMAP
model.setGroupModels(groupsArray);
}
success = model.writeFile(iDestDir + "/" + pModelFilename + ".vmo");
//std::cout << "readRawFile2: '" << pModelFilename << "' tris: " << nElements << " nodes: " << nNodes << std::endl;
return success;
}
void TileAssembler::exportGameobjectModels()
{
FILE* model_list = fopen((iSrcDir + "/" + GAMEOBJECT_MODELS).c_str(), "rb");
@@ -405,13 +405,13 @@ namespace VMAP
READ_OR_RETURN(&mogpflags, sizeof(uint32));
READ_OR_RETURN(&GroupWMOID, sizeof(uint32));
Vector3 vec1, vec2;
READ_OR_RETURN(&vec1, sizeof(Vector3));
READ_OR_RETURN(&vec2, sizeof(Vector3));
bounds.set(vec1, vec2);
READ_OR_RETURN(&liquidflags, sizeof(uint32));
// will this ever be used? what is it good for anyway??
@@ -475,7 +475,7 @@ namespace VMAP
size = hlq.xtiles*hlq.ytiles;
READ_OR_RETURN(liquid->GetFlagsStorage(), size);
}
return true;
}
@@ -484,7 +484,7 @@ namespace VMAP
{
delete liquid;
}
bool WorldModel_Raw::Read(const char * path)
{
FILE* rf = fopen(path, "rb");
@@ -493,7 +493,7 @@ namespace VMAP
printf("ERROR: Can't open raw model file: %s\n", path);
return false;
}
char ident[8];
int readOperation = 0;
src/server/collision/Models/GameObjectModel.cpp
+1 -1
View File
@@ -15,7 +15,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 "VMapFactory.h"
#include "VMapManager2.h"
#include "VMapDefinitions.h"
src/server/collision/Models/GameObjectModel.h
+2 -2
View File
@@ -15,7 +15,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 _GAMEOBJECT_MODEL_H
#define _GAMEOBJECT_MODEL_H
@@ -57,7 +57,7 @@ public:
const G3D::Vector3& getPosition() const { return iPos;}
/** Enables\disables collision. */
/** Enables\disables collision. */
void disable() { phasemask = 0;}
void enable(uint32 ph_mask) { phasemask = ph_mask;}
src/server/collision/RegularGrid.h
+2 -2
View File
@@ -135,7 +135,7 @@ public:
float ky_inv = ray.invDirection().y, by = ray.origin().y;
int stepX, stepY;
float tMaxX, tMaxY;
float tMaxX, tMaxY;
if (kx_inv >= 0)
{
stepX = 1;
@@ -215,4 +215,4 @@ public:
#undef CELL_SIZE
#undef HGRID_MAP_SIZE
#endif
#endif
src/server/game/AI/SmartScripts/SmartAI.cpp
+5 -5
View File
@@ -450,7 +450,7 @@ void SmartAI::EnterEvadeMode()
return;
RemoveAuras();
me->DeleteThreatList();
me->CombatStop(true);
me->LoadCreaturesAddon();
@@ -480,15 +480,15 @@ void SmartAI::MoveInLineOfSight(Unit* who)
{
if (!who)
return;
GetScript()->OnMoveInLineOfSight(who);
if (me->HasReactState(REACT_PASSIVE) || AssistPlayerInCombat(who))
return;
if (!CanAIAttack(who))
return;
if (!me->canStartAttack(who, false))
return;
@@ -827,7 +827,7 @@ void SmartAI::SetScript9(SmartScriptHolder& e, uint32 entry, Unit* invoker)
GetScript()->mLastInvoker = invoker->GetGUID();
GetScript()->SetScript9(e, entry);
}
void SmartAI::sOnGameEvent(bool start, uint16 eventId)
{
GetScript()->ProcessEventsFor(start ? SMART_EVENT_GAME_EVENT_START : SMART_EVENT_GAME_EVENT_END, NULL, eventId);
src/server/game/AI/SmartScripts/SmartAI.h
+1 -1
View File
@@ -195,7 +195,7 @@ class SmartAI : public CreatureAI
mDespawnState = t ? 1 : 0;
}
void StartDespawn() { mDespawnState = 2; }
void RemoveAuras();
private:
src/server/game/AI/SmartScripts/SmartScript.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ void SmartScript::ProcessEventsFor(SMART_EVENT e, Unit* unit, uint32 var0, uint3
ConditionList conds = sConditionMgr->GetConditionsForSmartEvent((*i).entryOrGuid, (*i).event_id, (*i).source_type);
ConditionSourceInfo info = ConditionSourceInfo(unit, GetBaseObject());
meets = sConditionMgr->IsObjectMeetToConditions(info, conds);
if (meets)
ProcessEvent(*i, unit, var0, var1, bvar, spell, gob);
}
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
+1 -1
View File
@@ -260,7 +260,7 @@ bool SmartAIMgr::IsTargetValid(SmartScriptHolder const& e)
}
case SMART_TARGET_GAMEOBJECT_GUID:
{
if (e.target.goGUID.entry && !IsGameObjectValid(e, e.target.goGUID.entry))
if (e.target.goGUID.entry && !IsGameObjectValid(e, e.target.goGUID.entry))
return false;
break;
}
src/server/game/AI/SmartScripts/SmartScriptMgr.h
+7 -7
View File
@@ -154,7 +154,7 @@ enum SMART_EVENT
SMART_EVENT_IS_BEHIND_TARGET = 67, //1 // cooldownMin, CooldownMax
SMART_EVENT_GAME_EVENT_START = 68, //1 // game_event.Entry
SMART_EVENT_GAME_EVENT_END = 69, //1 // game_event.Entry
SMART_EVENT_GO_STATE_CHANGED = 70, // go state
SMART_EVENT_GO_STATE_CHANGED = 70, // go state
SMART_EVENT_END = 71,
};
@@ -341,16 +341,16 @@ struct SmartEvent
uint32 cooldownMax;
} behindTarget;
struct
struct
{
uint32 gameEventId;
} gameEvent;
struct
{
uint32 state;
} goStateChanged;
struct
{
uint32 param1;
@@ -872,7 +872,7 @@ struct SmartAction
{
uint32 goRespawnTime;
} RespawnTarget;
struct
{
uint32 gossipMenuId;
@@ -883,12 +883,12 @@ struct SmartAction
{
uint32 state;
} setGoLootState;
struct
{
uint32 id;
} sendTargetToTarget;
struct
{
uint32 param1;
src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
+3 -3
View File
@@ -102,7 +102,7 @@ void BattlegroundRV::StartingEventOpenDoors()
setState(BG_RV_STATE_OPEN_FENCES);
setTimer(BG_RV_FIRST_TIMER);
TogglePillarCollision(true);
}
@@ -239,11 +239,11 @@ void BattlegroundRV::TogglePillarCollision(bool apply)
if (gob->GetGOInfo()->door.startOpen)
_state = GO_STATE_ACTIVE;
gob->SetGoState(apply ? (GOState)_state : (GOState)(!_state));
if (gob->GetGOInfo()->door.startOpen)
gob->EnableCollision(!apply); // Forced collision toggle
}
for (BattlegroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
if (Player* player = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER)))
gob->SendUpdateToPlayer(player);
src/server/game/Chat/Commands/TicketCommands.cpp
+1 -1
View File
@@ -257,7 +257,7 @@ bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args)
ticket->SaveToDB(trans);
sTicketMgr->UpdateLastChange();
std::string msg = ticket->FormatMessageString(*this, NULL, ticket->GetAssignedToName().c_str(),
std::string msg = ticket->FormatMessageString(*this, NULL, ticket->GetAssignedToName().c_str(),
m_session ? m_session->GetPlayer()->GetName() : "Console", NULL);
SendGlobalGMSysMessage(msg.c_str());
return true;
src/server/game/Conditions/ConditionMgr.cpp
+4 -4
View File
@@ -193,7 +193,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
case CONDITION_OBJECT_ENTRY:
{
if (object->GetTypeId() == ConditionValue1)
condMeets = (!ConditionValue2) || (object->GetEntry() == ConditionValue2);
condMeets = (!ConditionValue2) || (object->GetEntry() == ConditionValue2);
break;
}
case CONDITION_TYPE_MASK:
@@ -302,8 +302,8 @@ uint32 Condition::GetMaxAvailableConditionTargets()
case CONDITION_SOURCE_TYPE_GOSSIP_MENU:
case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION:
return 2;
case CONDITION_SOURCE_TYPE_SMART_EVENT:
return 2;
case CONDITION_SOURCE_TYPE_SMART_EVENT:
return 2;
default:
return 1;
}
@@ -1437,7 +1437,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
return false;
}
if (cond->ConditionValue3)
sLog->outErrorDb("ObjectEntry condition has useless data in value3 (%u)!", cond->ConditionValue3);
sLog->outErrorDb("ObjectEntry condition has useless data in value3 (%u)!", cond->ConditionValue3);
break;
}
case CONDITION_TYPE_MASK:
src/server/game/DungeonFinding/LFGMgr.cpp
+7 -7
View File
@@ -83,12 +83,12 @@ void LFGMgr::_LoadFromDB(Field* fields, uint64 guid)
uint32 dungeon = fields[16].GetUInt32();
uint8 state = fields[17].GetUInt8();
if (!dungeon || !state)
return;
SetDungeon(guid, dungeon);
switch (state)
{
case LFG_STATE_DUNGEON:
@@ -104,19 +104,19 @@ void LFGMgr::_SaveToDB(uint64 guid, uint32 db_guid)
{
if (!IS_GROUP(guid))
return;
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_LFG_DATA);
stmt->setUInt32(0, db_guid);
CharacterDatabase.Execute(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_LFG_DATA);
stmt->setUInt32(0, db_guid);
stmt->setUInt32(1, GetDungeon(guid));
stmt->setUInt32(2, GetState(guid));
CharacterDatabase.Execute(stmt);
}
@@ -999,7 +999,7 @@ bool LFGMgr::CheckCompatibility(LfgGuidList check, LfgProposal*& pProposal)
LfgQueueInfo* queue = itQueue->second;
if (!queue)
continue;
for (LfgRolesMap::const_iterator itPlayer = queue->roles.begin(); itPlayer != queue->roles.end(); ++itPlayer)
{
if (*itPlayers == ObjectAccessor::FindPlayer(itPlayer->first))
src/server/game/Entities/GameObject/GameObject.h
+2 -2
View File
@@ -710,7 +710,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>
uint8 GetGoAnimProgress() const { return GetByteValue(GAMEOBJECT_BYTES_1, 3); }
void SetGoAnimProgress(uint8 animprogress) { SetByteValue(GAMEOBJECT_BYTES_1, 3, animprogress); }
static void SetGoArtKit(uint8 artkit, GameObject* go, uint32 lowguid = 0);
void SetPhaseMask(uint32 newPhaseMask, bool update);
void EnableCollision(bool enable);
@@ -795,7 +795,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>
std::string GetAIName() const;
void SetDisplayId(uint32 displayid);
GameObjectModel * m_model;
protected:
bool AIM_Initialize();
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -14828,7 +14828,7 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
uint16 log_slot = FindQuestSlot(0);
if (log_slot >= MAX_QUEST_LOG_SIZE) // Player does not have any free slot in the quest log
return;
return;
uint32 quest_id = quest->GetQuestId();
src/server/game/Entities/Unit/Unit.cpp
+1 -1
View File
@@ -14826,7 +14826,7 @@ Unit* Unit::SelectNearbyTarget(Unit* exclude, float dist) const
// remove current target
if (getVictim())
targets.remove(getVictim());
if (exclude)
targets.remove(exclude);
src/server/game/Handlers/AuctionHouseHandler.cpp
+2 -2
View File
@@ -128,7 +128,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR);
return;
}
for (uint32 i = 0; i < itemsCount; ++i)
{
recv_data >> itemGUIDs[i];
@@ -188,7 +188,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
return;
}
if (sAuctionMgr->GetAItem(item->GetGUIDLow()) || !item->CanBeTraded() || item->IsNotEmptyBag() ||
if (sAuctionMgr->GetAItem(item->GetGUIDLow()) || !item->CanBeTraded() || item->IsNotEmptyBag() ||
item->GetTemplate()->Flags & ITEM_PROTO_FLAG_CONJURED || item->GetUInt32Value(ITEM_FIELD_DURATION) ||
item->GetCount() < count[i])
{
src/server/game/Handlers/CalendarHandler.cpp
+2 -2
View File
@@ -88,7 +88,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/)
data << uint32(counter); // raid reset count
std::set<uint32> sentMaps;
ResetTimeByMapDifficultyMap const& resets = sInstanceSaveMgr->GetResetTimeMap();
for (ResetTimeByMapDifficultyMap::const_iterator itr = resets.begin(); itr != resets.end(); ++itr)
{
@@ -102,7 +102,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recv_data*/)
continue;
sentMaps.insert(mapId);
data << uint32(mapId);
data << uint32(itr->second - cur_time);
data << uint32(mapEntry->unk_time);
src/server/game/Handlers/CharacterHandler.cpp
+1 -1
View File
@@ -197,7 +197,7 @@ bool LoginQueryHolder::Initialize()
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_ACCOUNT_INSTANCELOCKTIMES);
stmt->setUInt32(0, m_accountId);
res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADINSTANCELOCKTIMES, stmt);
return res;
}
src/server/game/Maps/Map.h
+1 -1
View File
@@ -171,7 +171,7 @@ class GridMap
uint8 _liquidOffY;
uint8 _liquidWidth;
uint8 _liquidHeight;
bool loadAreaData(FILE* in, uint32 offset, uint32 size);
bool loadHeihgtData(FILE* in, uint32 offset, uint32 size);
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+5 -5
View File
@@ -111,8 +111,8 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature &creature)
m_isArrivalDone = false;
creature.AddUnitState(UNIT_STATE_ROAMING_MOVE);
creature.AddUnitState(UNIT_STATE_ROAMING_MOVE);
Movement::MoveSplineInit init(creature);
init.MoveTo(node->x, node->y, node->z);
@@ -147,7 +147,7 @@ bool WaypointMovementGenerator<Creature>::Update(Creature &creature, const uint3
if (CanMove(diff))
return StartMove(creature);
}
else
else
{
if (creature.IsStopped())
Stop(STOP_TIME_FOR_PLAYER);
@@ -155,7 +155,7 @@ bool WaypointMovementGenerator<Creature>::Update(Creature &creature, const uint3
{
OnArrived(creature);
return StartMove(creature);
}
}
}
return true;
}
@@ -293,7 +293,7 @@ bool FlightPathMovementGenerator::GetResetPosition(Player&, float& x, float& y,
x = node.x; y = node.y; z = node.z;
return true;
}
void FlightPathMovementGenerator::InitEndGridInfo()
{
/*! Storage to preload flightmaster grid at end of flight. For multi-stop flights, this will
src/server/game/Spells/Auras/SpellAuraEffects.h
+1 -1
View File
@@ -104,7 +104,7 @@ class AuraEffect
int32 m_periodicTimer;
int32 m_amplitude;
uint32 m_tickNumber;
uint8 const m_effIndex;
bool m_canBeRecalculated;
bool m_isPeriodic;
src/server/game/Spells/Auras/SpellAuras.cpp
+1 -1
View File
@@ -2045,7 +2045,7 @@ void Aura::TriggerProcOnEvent(AuraApplication* aurApp, ProcEventInfo& eventInfo)
if (aurApp->HasEffect(i))
// TODO: OnEffectProc hook here (allowing prevention of selected effects)
GetEffect(i)->HandleProc(aurApp, eventInfo);
// TODO: AfterEffectProc hook here
// TODO: AfterEffectProc hook here
// TODO: AfterProc hook here
src/server/game/Spells/Auras/SpellAuras.h
+1 -1
View File
@@ -186,7 +186,7 @@ class Aura
bool CanStackWith(Aura const* existingAura) const;
// Proc system
// this subsystem is not yet in use - the core of it is functional, but still some research has to be done
// this subsystem is not yet in use - the core of it is functional, but still some research has to be done
// and some dependant problems fixed before it can replace old proc system (for example cooldown handling)
// currently proc system functionality is implemented in Unit::ProcDamageAndSpell
bool IsProcOnCooldown() const;
src/server/game/World/World.cpp
+1 -1
View File
@@ -1276,7 +1276,7 @@ void World::SetInitialWorldSettings()
sLog->outString("Loading GameObject models...");
LoadGameObjectModelList();
sLog->outString("Loading Script Names...");
sObjectMgr->LoadScriptNames();
src/server/scripts/Commands/cs_debug.cpp
+1 -1
View File
@@ -1041,7 +1041,7 @@ public:
handler->GetSession()->GetPlayer()->HandleEmoteCommand(animId);
return true;
}
static bool HandleDebugLoSCommand(ChatHandler* handler, char const* /*args*/)
{
if (Unit* unit = handler->getSelectedUnit())
src/server/scripts/Commands/cs_go.cpp
+1 -1
View File
@@ -496,7 +496,7 @@ public:
float z;
float ort = port ? (float)atof(port) : player->GetOrientation();
uint32 mapId = id ? (uint32)atoi(id) : player->GetMapId();
if (goZ)
{
z = (float)atof(goZ);
src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ enum Yells
YELL_RESPAWN1 = -1810010, // no creature_text
YELL_RESPAWN2 = -1810011, // no creature_text
YELL_RANDOM = 2,
YELL_SPELL = 3,
YELL_SPELL = 3,
};
enum Spells
src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+1 -1
View File
@@ -1301,7 +1301,7 @@ void AddSC_blackrock_depths()
new npc_kharan_mighthammer();
new npc_lokhtos_darkbargainer();
new npc_rocknot();
// Fix us
// Fix us
/*new npc_dughal_stormwing();
new npc_tobias_seecher();
new npc_marshal_windsor();
src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
switch (uiPointId)
{
case 4:Talk(SAY_PROGRESS_2, player->GetGUID());break;
case 4:Talk(SAY_PROGRESS_2, player->GetGUID());break;
case 5:Talk(SAY_PROGRESS_3, player->GetGUID());break;
case 8:Talk(EMOTE_PROGRESS_4);break;
case 9:
src/server/scripts/Examples/example_spell.cpp
+2 -2
View File
@@ -93,14 +93,14 @@ class spell_ex_5581 : public SpellScriptLoader
void HandleAfterCast()
{
sLog->outString("All immediate actions for the spell are finished now");
// this is a safe for triggering additional effects for a spell without interfering
// this is a safe for triggering additional effects for a spell without interfering
// with visuals or with other effects of the spell
//GetCaster()->CastSpell(target, SPELL_TRIGGERED, true);
}
SpellCastResult CheckRequirement()
{
// in this hook you can add additional requirements for spell caster (and throw a client error if reqs're not passed)
// in this hook you can add additional requirements for spell caster (and throw a client error if reqs're not passed)
// in this case we're disallowing to select non-player as a target of the spell
//if (!GetTargetUnit() || GetTargetUnit()->ToPlayer())
//return SPELL_FAILED_BAD_TARGETS;
src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+3 -3
View File
@@ -165,14 +165,14 @@ public:
DoCast(target, SPELL_FROST_BOLT_VOLLEY);
}
frostBoltVolleyTimer = urand(5000, 8000);
}
}
else frostBoltVolleyTimer -= diff;
if (frostNovaTimer <= diff)
{
DoCastAOE(SPELL_FROST_NOVA, false);
frostNovaTimer = urand(25000, 30000);
}
}
else frostNovaTimer -= diff;
break;
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+1 -1
View File
@@ -947,7 +947,7 @@ void hyjalAI::HideNearPos(float x, float y)
Trinity::AllFriendlyCreaturesInGrid creature_check(me);
Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid> creature_searcher(me, creatures, creature_check);
TypeContainerVisitor <Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> creature_visitor(creature_searcher);
TypeContainerVisitor <Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> creature_visitor(creature_searcher);
cell.Visit(pair, creature_visitor, *(me->GetMap()), *me, me->GetGridActivationRange());
if (!creatures.empty())
src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+3 -3
View File
@@ -77,7 +77,7 @@ public:
if (target)
DoCast(target, SPELL_WRATH);
Wrath_Timer = 8000;
}
}
else Wrath_Timer -= diff;
//EntanglingRoots
@@ -85,7 +85,7 @@ public:
{
DoCast(me->getVictim(), SPELL_ENTANGLINGROOTS);
EntanglingRoots_Timer = 20000;
}
}
else EntanglingRoots_Timer -= diff;
//CorruptForces
@@ -94,7 +94,7 @@ public:
me->InterruptNonMeleeSpells(false);
DoCast(me, SPELL_CORRUPT_FORCES);
CorruptForces_Timer = 20000;
}
}
else CorruptForces_Timer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
+3 -3
View File
@@ -71,7 +71,7 @@ public:
{
DoCast(me->getVictim(), SPELL_KNOCKAWAY);
KnockAway_Timer = 15000;
}
}
else KnockAway_Timer -= diff;
//Trample_Timer
@@ -79,7 +79,7 @@ public:
{
DoCast(me, SPELL_TRAMPLE);
Trample_Timer = 8000;
}
}
else Trample_Timer -= diff;
//Landslide
@@ -90,7 +90,7 @@ public:
me->InterruptNonMeleeSpells(false);
DoCast(me, SPELL_LANDSLIDE);
Landslide_Timer = 60000;
}
}
else Landslide_Timer -= diff;
}
src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
+4 -4
View File
@@ -80,7 +80,7 @@ public:
me->SetDisplayId(11172);
Invisible = false;
//me->m_canMove = true;
}
}
else if (Invisible)
{
Invisible_Timer -= diff;
@@ -97,7 +97,7 @@ public:
{
DoCast(me->getVictim(), SPELL_TOXICVOLLEY);
ToxicVolley_Timer = 9000;
}
}
else ToxicVolley_Timer -= diff;
//Uppercut_Timer
@@ -105,7 +105,7 @@ public:
{
DoCast(me->getVictim(), SPELL_UPPERCUT);
Uppercut_Timer = 12000;
}
}
else Uppercut_Timer -= diff;
//Adds_Timer
@@ -127,7 +127,7 @@ public:
Invisible_Timer = 15000;
Adds_Timer = 40000;
}
}
else Adds_Timer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
+4 -4
View File
@@ -77,7 +77,7 @@ public:
{
DoCast(me, SPELL_DUSTFIELD);
Dustfield_Timer = 14000;
}
}
else Dustfield_Timer -= diff;
//Boulder_Timer
@@ -88,7 +88,7 @@ public:
if (target)
DoCast(target, SPELL_BOULDER);
Boulder_Timer = 10000;
}
}
else Boulder_Timer -= diff;
//RepulsiveGaze_Timer
@@ -96,7 +96,7 @@ public:
{
DoCast(me->getVictim(), SPELL_REPULSIVEGAZE);
RepulsiveGaze_Timer = 20000;
}
}
else RepulsiveGaze_Timer -= diff;
//Thrash_Timer
@@ -104,7 +104,7 @@ public:
{
DoCast(me, SPELL_THRASH);
Thrash_Timer = 18000;
}
}
else Thrash_Timer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/Kalimdor/desolace.cpp
+1 -1
View File
@@ -175,7 +175,7 @@ public:
## Hand of Iruxos
######*/
enum
enum
{
QUEST_HAND_IRUXOS = 5381,
NPC_DEMON_SPIRIT = 11876,
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ class at_frozen_throne_teleport : public AreaTriggerScript
Spell::SendCastResult(player, spell, 0, SPELL_FAILED_AFFECTING_COMBAT);
return true;
}
if (InstanceScript* instance = player->GetInstanceScript())
if (instance->GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE &&
instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) == DONE &&
src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+1 -1
View File
@@ -289,7 +289,7 @@ public:
void JustDied(Unit* /*killer*/)
{
_JustDied();
DoCast(me, SPELL_DEATH_SPELL, true); // we cast the spell as triggered or the summon effect does not occur
DoCast(me, SPELL_DEATH_SPELL, true); // we cast the spell as triggered or the summon effect does not occur
}
void LeaveCombat()
src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+1 -1
View File
@@ -201,7 +201,7 @@ public:
Talk(SAY_UROM);
me->DespawnOrUnsummon(60000);
}
}
}
};
CreatureAI* GetAI(Creature* creature) const
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+1 -1
View File
@@ -1670,7 +1670,7 @@ class spell_pursue : public SpellScriptLoader
if (Creature* caster = GetCaster()->ToCreature())
caster->AI()->EnterEvadeMode();
}
else
else
{
//! In the end, only one target should be selected
_target = SelectRandomContainerElement(targets);
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+1 -1
View File
@@ -593,7 +593,7 @@ class boss_freya : public CreatureScript
void JustDied(Unit* /*who*/)
{
//! Freya's chest is dynamically spawned on death by different spells.
const uint32 summonSpell[2][4] =
const uint32 summonSpell[2][4] =
{
/* 0Elder, 1Elder, 2Elder, 3Elder */
/* 10N */ {62950, 62953, 62955, 62957},
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+2 -2
View File
@@ -18,7 +18,7 @@
/* ScriptData
SDName: Boss_Prince_Keleseth
SD%Complete: 100
SDComment:
SDComment:
SDCategory: Utgarde Keep
EndScriptData */
@@ -158,7 +158,7 @@ public:
{
if (data == DATA_ON_THE_ROCKS)
return onTheRocks;
return 0;
}
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+15 -15
View File
@@ -34,7 +34,7 @@ enum Spells
SPELL_RITUAL_DISARM = 54159,
SPELL_RITUAL_STRIKE_EFF_1 = 48277,
SPELL_RITUAL_STRIKE_EFF_2 = 59930,
SPELL_SUMMONED_VIS = 64446,
SPELL_RITUAL_CHANNELER_1 = 48271,
SPELL_RITUAL_CHANNELER_2 = 48274,
@@ -62,7 +62,7 @@ enum Yells
SAY_SLAY = 3,
SAY_DEATH = 4,
SAY_SACRIFICE_PLAYER = 5,
// Image of Arthas
SAY_DIALOG_OF_ARTHAS_1 = 0,
SAY_DIALOG_OF_ARTHAS_2 = 1
@@ -101,7 +101,7 @@ enum SvalaPoint
#define DATA_INCREDIBLE_HULK 2043
static const float spectatorWP[2][3] =
static const float spectatorWP[2][3] =
{
{296.95f,-312.76f,86.36f},
{297.69f,-275.81f,86.36f}
@@ -133,7 +133,7 @@ public:
InstanceScript* instance;
SummonList summons;
SvalaPhase Phase;
Position pos;
float x, y, z;
@@ -157,7 +157,7 @@ public:
summons.DespawnAll();
me->RemoveAllAuras();
if (Phase > INTRO)
{
me->SetFlying(true);
@@ -177,7 +177,7 @@ public:
instance->SetData64(DATA_SACRIFICED_PLAYER, 0);
}
}
void JustReachedHome()
{
if (Phase > INTRO)
@@ -188,23 +188,23 @@ public:
me->SendMovementFlagUpdate();
}
}
void EnterCombat(Unit* /*who*/)
{
Talk(SAY_AGGRO);
sinsterStrikeTimer = 7 * IN_MILLISECONDS;
callFlamesTimer = urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS);
if (instance)
instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS);
}
void JustSummoned(Creature* summon)
{
if (summon->GetEntry() == CREATURE_RITUAL_CHANNELER)
summon->CastSpell(summon, SPELL_SUMMONED_VIS, true);
summons.Summon(summon);
}
@@ -222,7 +222,7 @@ public:
{
Phase = INTRO;
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
if (GameObject* mirror = GetClosestGameObjectWithEntry(me, OBJECT_UTGARDE_MIRROR, 100.0f))
mirror->SetGoState(GO_STATE_READY);
@@ -233,13 +233,13 @@ public:
}
}
}
void KilledUnit(Unit* victim)
{
if (victim != me)
Talk(SAY_SLAY);
}
void DamageTaken(Unit* attacker, uint32 &damage)
{
if (Phase == SVALADEAD)
@@ -532,7 +532,7 @@ public:
if (IsHeroic())
DoCast(me, SPELL_SHADOWS_IN_THE_DARK);
}
void UpdateAI(const uint32 diff)
{
if (me->HasUnitState(UNIT_STATE_CASTING))
@@ -648,7 +648,7 @@ class npc_scourge_hulk : public CreatureScript
{
return type == DATA_INCREDIBLE_HULK ? killedByRitualStrike : 0;
}
void DamageTaken(Unit* attacker, uint32 &damage)
{
if (damage >= me->GetHealth() && attacker->GetEntry() == CREATURE_SVALA_SORROWGRAVE)
src/server/scripts/Northrend/dalaran.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ public:
return;
Player* player = who->GetCharmerOrOwnerPlayerOrPlayerItself();
if (!player || player->isGameMaster() || player->IsBeingTeleported() ||
// If player has Disguise aura for quest A Meeting With The Magister or An Audience With The Arcanist, do not teleport it away but let it pass
player->HasAura(SPELL_SUNREAVER_DISGUISE_FEMALE) || player->HasAura(SPELL_SUNREAVER_DISGUISE_MALE) ||
src/server/scripts/Northrend/sholazar_basin.cpp
+1 -1
View File
@@ -676,7 +676,7 @@ enum MiscLifewarden
NPC_SERVANT = 28320, // Servant of Freya
WHISPER_ACTIVATE = 0,
SPELL_FREYA_DUMMY = 51318,
SPELL_LIFEFORCE = 51395,
SPELL_FREYA_DUMMY_TRIGGER = 51335,
src/server/scripts/Outland/blades_edge_mountains.cpp
+1 -1
View File
@@ -977,7 +977,7 @@ class npc_simon_bunny : public CreatureScript
uint32 rewSpell = 0;
switch (level)
{
case 6:
case 6:
if (large)
GivePunishment();
else
src/server/scripts/Spells/spell_dk.cpp
+4 -4
View File
@@ -698,7 +698,7 @@ class spell_dk_death_strike : public SpellScriptLoader
{
OnEffectHitTarget += SpellEffectFn(spell_dk_death_strike_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
@@ -747,7 +747,7 @@ class spell_dk_death_coil : public SpellScriptLoader
{
OnEffectHitTarget += SpellEffectFn(spell_dk_death_coil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
@@ -776,7 +776,7 @@ class spell_dk_death_grip : public SpellScriptLoader
GetSummonPosition(effIndex, pos, 0.0f, 0);
if (!target->HasAuraType(SPELL_AURA_DEFLECT_SPELLS)) // Deterrence
target->CastSpell(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), damage, true);
target->CastSpell(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), damage, true);
}
}
@@ -784,7 +784,7 @@ class spell_dk_death_grip : public SpellScriptLoader
{
OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
src/server/scripts/Spells/spell_generic.cpp
+1 -1
View File
@@ -1599,7 +1599,7 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader
{
OnEffectHitTarget += SpellEffectFn(spell_gen_spirit_healer_res_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
};
SpellScript* GetSpellScript() const
{
src/server/scripts/Spells/spell_hunter.cpp
+3 -3
View File
@@ -50,12 +50,12 @@ class spell_hun_aspect_of_the_beast : public SpellScriptLoader
class spell_hun_aspect_of_the_beast_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_aspect_of_the_beast_AuraScript);
bool Load()
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
}
bool Validate(SpellInfo const* /*entry*/)
{
if (!sSpellMgr->GetSpellInfo(HUNTER_SPELL_ASPECT_OF_THE_BEAST_PET))
@@ -506,7 +506,7 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader
class spell_hun_pet_carrion_feeder_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript);
bool Load()
{
if (!GetCaster()->isPet())
src/server/scripts/Spells/spell_item.cpp
+6 -6
View File
@@ -813,7 +813,7 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader
class spell_item_book_of_glyph_mastery_SpellScript : public SpellScript
{
PrepareSpellScript(spell_item_book_of_glyph_mastery_SpellScript);
bool Load()
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -1123,7 +1123,7 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
}
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_PURIFIED_HELBOAR_MEAT) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_TOXIC_HELBOAR_MEAT))
@@ -1162,7 +1162,7 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader
class spell_item_crystal_prison_dummy_dnd_SpellScript : public SpellScript
{
PrepareSpellScript(spell_item_crystal_prison_dummy_dnd_SpellScript);
bool Validate(SpellInfo const* /*spell*/)
{
if (!sObjectMgr->GetGameObjectTemplate(OBJECT_IMPRISONED_DOOMGUARD))
@@ -1229,7 +1229,7 @@ class spell_item_reindeer_transformation : public SpellScriptLoader
caster->RemoveAurasByType(SPELL_AURA_MOUNTED);
//5 different spells used depending on mounted speed and if mount can fly or not
if (flyspeed >= 4.1f)
// Flying Reindeer
caster->CastSpell(caster, SPELL_FLYING_REINDEER_310, true); //310% flying Reindeer
@@ -1328,7 +1328,7 @@ class spell_item_poultryizer : public SpellScriptLoader
void HandleDummy(SpellEffIndex /* effIndex */)
{
if (GetCastItem() && GetHitUnit())
if (GetCastItem() && GetHitUnit())
GetCaster()->CastSpell(GetHitUnit(), roll_chance_i(80) ? SPELL_POULTRYIZER_SUCCESS : SPELL_POULTRYIZER_BACKFIRE , true, GetCastItem());
}
@@ -1358,7 +1358,7 @@ class spell_item_socrethars_stone : public SpellScriptLoader
class spell_item_socrethars_stone_SpellScript : public SpellScript
{
PrepareSpellScript(spell_item_socrethars_stone_SpellScript);
bool Load()
{
return (GetCaster()->GetAreaId() == 3900 || GetCaster()->GetAreaId() == 3742);
src/server/scripts/Spells/spell_mage.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ class spell_mage_cold_snap : public SpellScriptLoader
void HandleDummy(SpellEffIndex /*effIndex*/)
{
Player* caster = GetCaster()->ToPlayer();
// immediately finishes the cooldown on Frost spells
const SpellCooldowns& cm = caster->GetSpellCooldownMap();
src/server/scripts/Spells/spell_priest.cpp
+1 -1
View File
@@ -252,7 +252,7 @@ class spell_pri_reflective_shield_trigger : public SpellScriptLoader
Unit* target = GetTarget();
if (dmgInfo.GetAttacker() == target)
return;
if (Unit* caster = GetCaster())
if (AuraEffect* talentAurEff = target->GetAuraEffectOfRankedSpell(PRIEST_SPELL_REFLECTIVE_SHIELD_R1, EFFECT_0))
{
src/server/scripts/Spells/spell_quest.cpp
+1 -1
View File
@@ -993,7 +993,7 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader
class spell_q14112_14145_chum_the_water_SpellScript : public SpellScript
{
PrepareSpellScript(spell_q14112_14145_chum_the_water_SpellScript);
bool Validate(SpellInfo const* /*spellEntry*/)
{
if (!sSpellMgr->GetSpellInfo(SUMMON_ANGRY_KVALDIR) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_MAKO) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_THRESHER) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_BLUE_SHARK))
src/server/scripts/Spells/spell_rogue.cpp
+2 -2
View File
@@ -258,7 +258,7 @@ class spell_rog_shiv : public SpellScriptLoader
class spell_rog_shiv_SpellScript : public SpellScript
{
PrepareSpellScript(spell_rog_shiv_SpellScript);
bool Load()
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -321,7 +321,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader
return;
Player* player = GetCaster()->ToPlayer();
if (Unit* target = GetHitUnit())
{
src/server/scripts/Spells/spell_shaman.cpp
+3 -3
View File
@@ -427,7 +427,7 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader
{
if (triggeringSpell)
damage = int32(owner->SpellHealingBonus(target, triggeringSpell, damage, HEAL));
// Restorative Totems
if (AuraEffect* dummy = owner->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_SHAMAN, ICON_ID_RESTORATIVE_TOTEMS, 1))
AddPctN(damage, dummy->GetAmount());
@@ -486,7 +486,7 @@ class spell_sha_mana_spring_totem : public SpellScriptLoader
{
OnEffectHitTarget += SpellEffectFn(spell_sha_mana_spring_totem_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
@@ -529,7 +529,7 @@ class spell_sha_lava_lash : public SpellScriptLoader
{
OnEffectHitTarget += SpellEffectFn(spell_sha_lava_lash_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
src/server/scripts/Spells/spell_warlock.cpp
+2 -2
View File
@@ -328,7 +328,7 @@ class spell_warl_soulshatter : public SpellScriptLoader
{
sLog->outString("THREATREDUCTION");
caster->CastSpell(target, SPELL_SOULSHATTER, true);
} else
} else
sLog->outString("can have threat? %b . threat number? %f ",target->CanHaveThreatList(),target->getThreatManager().getThreat(caster));
}
@@ -363,7 +363,7 @@ class spell_warl_life_tap : public SpellScriptLoader
class spell_warl_life_tap_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_life_tap_SpellScript);
bool Load()
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
src/server/scripts/Spells/spell_warrior.cpp
+1 -1
View File
@@ -333,7 +333,7 @@ class spell_warr_execute : public SpellScriptLoader
if (AuraEffect* aurEff = caster->GetAuraEffect(SPELL_GLYPH_OF_EXECUTION, EFFECT_0))
rageUsed += aurEff->GetAmount() * 10;
int32 bp = GetEffectValue() + int32(rageUsed * spellInfo->Effects[effIndex].DamageMultiplier + caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.2f);
caster->CastCustomSpell(target,SPELL_EXECUTE,&bp,0,0,true,0,0,GetOriginalCaster()->GetGUID());
}
src/server/scripts/World/go_scripts.cpp
+1 -1
View File
@@ -1312,7 +1312,7 @@ class go_veil_skith_cage : public GameObjectScript
(*itr)->AI()->Talk(SAY_FREE_0);
(*itr)->GetMotionMaster()->Clear();
}
}
}
return false;
}
};
src/server/shared/Database/Implementation/CharacterDatabase.h
+1 -1
View File
@@ -351,7 +351,7 @@ enum CharacterDatabaseStatements
CHAR_DEL_CHARACTER_SOCIAL,
CHAR_UPD_CHARACTER_SOCIAL_NOTE,
CHAR_UPD_CHARACTER_POSITION,
CHAR_INS_LFG_DATA,
CHAR_DEL_LFG_DATA,
src/server/shared/Threading/Callback.h
+1 -1
View File
@@ -96,7 +96,7 @@ class QueryCallback
{
return _stage;
}
//! Resets all underlying variables (param, result and stage)
void Reset()
{