diff options
| author | megamage <none@none> | 2009-02-12 16:48:42 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-12 16:48:42 -0600 |
| commit | 2d2f433b4de1c35b22aaf07854fc0ee11fcb350d (patch) | |
| tree | 0c96ad0fc6b02dbef9d48e05f9a54995bebcc51a /src/game/Creature.cpp | |
| parent | 58545982e47d571a6c854c780af8b450747f226a (diff) | |
| parent | b0694d7e5e794b361fa178d55fefdb98cf47e9ca (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index b87540e1802..127c679463d 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -796,6 +796,11 @@ bool Creature::isCanTrainingAndResetTalentsOf(Player* pPlayer) const void Creature::prepareGossipMenu( Player *pPlayer,uint32 gossipid ) { + //Prevent gossip from NPCs that are possessed. + Unit* Charmed = Unit::GetCharmer(); + if (Charmed) + return; + PlayerMenu* pm=pPlayer->PlayerTalkClass; pm->ClearMenus(); |