diff options
| author | QAston <none@none> | 2009-07-31 13:21:32 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-07-31 13:21:32 +0200 |
| commit | b212461f95aad264b608abfb88e66e0cf4ce511f (patch) | |
| tree | f97ca6171659153c6f045e71b33332e3ef1d178f /src/game/GameObject.cpp | |
| parent | 1f53433c6c4de01709410581ba644be7e6aaf6fe (diff) | |
| parent | 40f7c7243cae08cda7b129ac13d4768414753b4e (diff) | |
*Merge after backout.
--HG--
branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
| -rw-r--r-- | src/game/GameObject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 59ec04fc649..b6ac3442c0d 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -949,7 +949,7 @@ void GameObject::Use(Unit* user) UseDoorOrButton(); // activate script - sWorld.ScriptsStart(sGameObjectScripts, GetDBTableGUIDLow(), spellCaster, this); + GetMap()->ScriptsStart(sGameObjectScripts, GetDBTableGUIDLow(), spellCaster, this); return; case GAMEOBJECT_TYPE_QUESTGIVER: //2 @@ -1045,7 +1045,7 @@ void GameObject::Use(Unit* user) player->CastedCreatureOrGO(info->id, GetGUID(), 0); if (info->goober.eventId) - sWorld.ScriptsStart(sEventScripts, info->goober.eventId, player, this); + GetMap()->ScriptsStart(sEventScripts, info->goober.eventId, player, this); } // cast this spell later if provided @@ -1068,7 +1068,7 @@ void GameObject::Use(Unit* user) player->SendCinematicStart(info->camera.cinematicId); if (info->camera.eventID) - sWorld.ScriptsStart(sEventScripts, info->camera.eventID, player, this); + GetMap()->ScriptsStart(sEventScripts, info->camera.eventID, player, this); return; } |