aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting
diff options
context:
space:
mode:
authorclick <none@none>2010-09-25 22:03:57 +0200
committerclick <none@none>2010-09-25 22:03:57 +0200
commit461590832aa87d311a3d99640fc4453ea14325c5 (patch)
tree36ad7ee86166f055aff0f6feb585a5bd6ca290aa /src/server/game/Scripting
parenta596cae1d9386942c22dfdbf15d3c8856cc85d99 (diff)
Core: Generic cleanup (tab2spaces/whitespace removal)
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Scripting')
-rw-r--r--src/server/game/Scripting/MapScripts.cpp4
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp10
-rw-r--r--src/server/game/Scripting/ScriptMgr.h4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp
index 727f764ff3f..8eae8486f62 100644
--- a/src/server/game/Scripting/MapScripts.cpp
+++ b/src/server/game/Scripting/MapScripts.cpp
@@ -755,8 +755,8 @@ void Map::ScriptsProcess()
break;
}
- bool triggered = (step.script->CastSpell.Flags != 4) ?
- step.script->CastSpell.CreatureEntry & SF_CASTSPELL_TRIGGERED :
+ bool triggered = (step.script->CastSpell.Flags != 4) ?
+ step.script->CastSpell.CreatureEntry & SF_CASTSPELL_TRIGGERED :
step.script->CastSpell.CreatureEntry < 0;
uSource->CastSpell(uTarget, step.script->CastSpell.SpellID, triggered);
break;
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 76f10c144e5..c016f50ab9c 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1221,31 +1221,31 @@ void ScriptMgr::OnGuildDisband(Guild *guild)
void ScriptMgr::OnGroupAddMember(Group* group, uint64 guid)
{
- ASSERT(group);
+ ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnAddMember(group, guid);
}
void ScriptMgr::OnGroupInviteMember(Group* group, uint64 guid)
{
- ASSERT(group);
+ ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnInviteMember(group, guid);
}
void ScriptMgr::OnGroupRemoveMember(Group* group, uint64 guid, RemoveMethod method)
{
- ASSERT(group);
+ ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnRemoveMember(group, guid, method);
}
void ScriptMgr::OnGroupChangeLeader(Group* group, uint64 newLeaderGuid, uint64 oldLeaderGuid)
{
- ASSERT(group);
+ ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnChangeLeader(group, newLeaderGuid, oldLeaderGuid);
}
void ScriptMgr::OnGroupDisband(Group* group)
{
- ASSERT(group);
+ ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnDisband(group);
}
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 61d3119b500..b7b24916f78 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -690,7 +690,7 @@ class PlayerScript : public ScriptObject
// Called when a duel starts (after 3s countdown)
virtual void OnDuelStart(Player* /*player1*/, Player* /*player2*/) { }
-
+
// Called when a duel ends
virtual void OnDuelEnd(Player* /*winner*/, Player* /*looser*/, DuelCompleteType /*type*/) { }
@@ -737,7 +737,7 @@ class GuildScript : public ScriptObject
class GroupScript : public ScriptObject
{
protected:
- GroupScript(const char* name);
+ GroupScript(const char* name);
public:
bool IsDatabaseBound() const { return false; }