diff options
| author | Subv <subv2112@gmail.com> | 2013-12-29 15:13:14 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2013-12-29 15:13:14 -0500 |
| commit | d234d0f3d0889e799eb066ba39c9b1edbc964d6e (patch) | |
| tree | 17d6281266900fe843573d03eff46a3b2beabedb /src/server/scripts/Examples | |
| parent | 8658b5338c905c79daf50cb56dbe739f82d25acc (diff) | |
| parent | c40cdc2968c58d952878c09a60926af74f782867 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
Diffstat (limited to 'src/server/scripts/Examples')
| -rw-r--r-- | src/server/scripts/Examples/example_creature.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Examples/example_escort.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/Examples/example_spell.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index b13ec1e1503..3a675389d1e 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -128,7 +128,7 @@ class example_creature : public CreatureScript void EnterCombat(Unit* who) OVERRIDE { //Say some stuff - Talk(SAY_AGGRO, who->GetGUID()); + Talk(SAY_AGGRO, who); } // *** HANDLED FUNCTION *** @@ -236,7 +236,7 @@ class example_creature : public CreatureScript if (m_uiBeserkTimer <= uiDiff) { //Say our line then cast uber death spell - Talk(SAY_BERSERK, me->GetVictim() ? me->GetVictim()->GetGUID() : 0); + Talk(SAY_BERSERK, me->GetVictim()); DoCastVictim(SPELL_BERSERK); //Cast our beserk spell agian in 12 seconds if we didn't kill everyone diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index 8cbd2fc4933..e6afc690faf 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -100,9 +100,9 @@ class example_escort : public CreatureScript if (Player* player = GetPlayerForEscort()) { //pTmpPlayer is the target of the text - Talk(SAY_WP_3, player->GetGUID()); + Talk(SAY_WP_3, player); //pTmpPlayer is the source of the text - sCreatureTextMgr->SendChat(me, SAY_WP_4, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, player); + sCreatureTextMgr->SendChat(me, SAY_WP_4, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, player); } break; } @@ -113,7 +113,7 @@ class example_escort : public CreatureScript if (HasEscortState(STATE_ESCORT_ESCORTING)) { if (Player* player = GetPlayerForEscort()) - Talk(SAY_AGGRO1, player->GetGUID()); + Talk(SAY_AGGRO1, player); } else Talk(SAY_AGGRO2); @@ -133,9 +133,9 @@ class example_escort : public CreatureScript { // not a likely case, code here for the sake of example if (killer == me) - Talk(SAY_DEATH_1, player->GetGUID()); + Talk(SAY_DEATH_1, player); else - Talk(SAY_DEATH_2, player->GetGUID()); + Talk(SAY_DEATH_2, player); } } else diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index 2c76d9a40b0..af028d539f0 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -220,7 +220,7 @@ class spell_ex_66244 : public SpellScriptLoader // we initialize local variables if needed bool Load() OVERRIDE { - // do not load script if aura is casted by player or caster not avalible + // do not load script if aura is cast by player or caster not avalible if (Unit* caster = GetCaster()) if (caster->GetTypeId() == TYPEID_PLAYER) return true; |