aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/World
diff options
context:
space:
mode:
authorGyx <2359980687@qq.com>2012-03-17 12:17:15 +0800
committerGyx <2359980687@qq.com>2012-03-17 12:17:15 +0800
commit7877eae6ba00d3072eb020a045028e0c825a3831 (patch)
tree5047745028b8c9b7d03687edf112a1106054b548 /src/server/scripts/World
parent68ad764e2e603b7939d66cf714c5e67a126a6634 (diff)
Core/Script: Code style and remove unused core.
Signed-off-by: Gyx <2359980687@qq.com>
Diffstat (limited to 'src/server/scripts/World')
-rw-r--r--src/server/scripts/World/areatrigger_scripts.cpp9
-rw-r--r--src/server/scripts/World/guards.cpp24
2 files changed, 26 insertions, 7 deletions
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 1220a4a24fb..daf0ef213d9 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -252,8 +252,13 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript
{
switch (trigger->id)
{
- case AT_SHOLAZAR: player->CastSpell(player, SPELL_SHOLAZAR_TO_UNGORO_TELEPORT, false); break;
- case AT_UNGORO: player->CastSpell(player, SPELL_UNGORO_TO_SHOLAZAR_TELEPORT, false); break;
+ case AT_SHOLAZAR:
+ player->CastSpell(player, SPELL_SHOLAZAR_TO_UNGORO_TELEPORT, false);
+ break;
+
+ case AT_UNGORO:
+ player->CastSpell(player, SPELL_UNGORO_TO_SHOLAZAR_TELEPORT, false);
+ break;
}
}
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index 294f1cd291a..e3100522fbe 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -195,12 +195,26 @@ public:
{
switch (emote)
{
- case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break;
- case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break;
- case TEXT_EMOTE_SALUTE: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); break;
- case TEXT_EMOTE_SHY: me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); break;
+ case TEXT_EMOTE_KISS:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_BOW);
+ break;
+
+ case TEXT_EMOTE_WAVE:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE);
+ break;
+
+ case TEXT_EMOTE_SALUTE:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
+ break;
+
+ case TEXT_EMOTE_SHY:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX);
+ break;
+
case TEXT_EMOTE_RUDE:
- case TEXT_EMOTE_CHICKEN: me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); break;
+ case TEXT_EMOTE_CHICKEN:
+ me->HandleEmoteCommand(EMOTE_ONESHOT_POINT);
+ break;
}
}