mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into 310

Browse source 
Conflicts:
	src/game/Player.cpp
	src/game/SpellAuras.cpp
This commit is contained in:
tomrus88 2009-06-02 15:01:26 +04:00
commit cffbb8661b
44 changed files with 389 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/GameObject.cpp
View file

@ -951,6 +951,9 @@ void GameObject::Use(Unit* user)
// possible quest objective for active quests
player->CastedCreatureOrGO(info->id, GetGUID(), 0);
if (info->goober.eventId)
sWorld.ScriptsStart(sEventScripts, info->goober.eventId, player, this);
}
// cast this spell later if provided
@ -972,6 +975,9 @@ void GameObject::Use(Unit* user)
if (info->camera.cinematicId)
player->SendCinematicStart(info->camera.cinematicId);
if (info->camera.eventID)
sWorld.ScriptsStart(sEventScripts, info->camera.eventID, player, this);
return;
}
//fishing bobber