Merge pull request #4742 from Subv/gossips

xurxogr · xurxogr · commit 528a9a6966ca · 2012-01-10T03:16:06.000-08:00
Gossips
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -13997,6 +13997,10 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool
             PrepareQuestMenu(source->GetGUID());
     }
 
+    if (source->GetTypeId() == TYPEID_GAMEOBJECT)
+        if (source->ToGameObject()->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
+            PrepareQuestMenu(source->GetGUID());
+
     for (GossipMenuItemsMap::const_iterator itr = menuItemBounds.first; itr != menuItemBounds.second; ++itr)
     {
         bool canTalk = true;
@@ -14082,11 +14086,6 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool
 
             switch (itr->second.OptionType)
             {
-                case GOSSIP_OPTION_QUESTGIVER:
-                    if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
-                        PrepareQuestMenu(source->GetGUID());
-                    canTalk = false;
-                    break;
                 case GOSSIP_OPTION_GOSSIP:
                     if (go->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER && go->GetGoType() != GAMEOBJECT_TYPE_GOOBER)
                         canTalk = false;
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -160,7 +160,8 @@ void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recv_data)
         else
         {
             go->AI()->GossipSelect(_player, menuId, gossipListId);
-            sScriptMgr->OnGossipSelect(_player, go, _player->PlayerTalkClass->GetGossipOptionSender(gossipListId), _player->PlayerTalkClass->GetGossipOptionAction(gossipListId));
+            if (!sScriptMgr->OnGossipSelect(_player, go, _player->PlayerTalkClass->GetGossipOptionSender(gossipListId), _player->PlayerTalkClass->GetGossipOptionAction(gossipListId)))
+                _player->OnGossipSelect(go, gossipListId, menuId);
         }
     }
 }
diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
@@ -510,7 +510,7 @@ class account_commandscript : public CommandScript
 
             stmt->setUInt32(0, targetAccountId);
             stmt->setUInt8(1, uint8(gm));
-            stmt->setUInt32(2, gmRealmID);
+            stmt->setInt32(2, gmRealmID);
 
             LoginDatabase.Execute(stmt);
         }

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,8 @@ void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recv_data)`
`160`	`160`	`else`
`161`	`161`	`{`
`162`	`162`	`go->AI()->GossipSelect(_player, menuId, gossipListId);`
`163`		`- sScriptMgr->OnGossipSelect(_player, go, _player->PlayerTalkClass->GetGossipOptionSender(gossipListId), _player->PlayerTalkClass->GetGossipOptionAction(gossipListId));`
	`163`	`+ if (!sScriptMgr->OnGossipSelect(_player, go, _player->PlayerTalkClass->GetGossipOptionSender(gossipListId), _player->PlayerTalkClass->GetGossipOptionAction(gossipListId)))`
	`164`	`+ _player->OnGossipSelect(go, gossipListId, menuId);`
`164`	`165`	`}`
`165`	`166`	`}`
`166`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ class account_commandscript : public CommandScript`
`510`	`510`
`511`	`511`	`stmt->setUInt32(0, targetAccountId);`
`512`	`512`	`stmt->setUInt8(1, uint8(gm));`
`513`		`- stmt->setUInt32(2, gmRealmID);`
	`513`	`+ stmt->setInt32(2, gmRealmID);`
`514`	`514`
`515`	`515`	`LoginDatabase.Execute(stmt);`
`516`	`516`	`}`