mirror of
https://github.com/mangosfour/server.git
synced 2025-12-17 07:37:03 +00:00
[11867] Implement GOSSIP_OPTION_MAILBOX
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
parent
249fc30abc
commit
18679dbab1
3 changed files with 25 additions and 19 deletions
|
|
@ -31,24 +31,25 @@ class WorldSession;
|
||||||
|
|
||||||
enum Gossip_Option
|
enum Gossip_Option
|
||||||
{
|
{
|
||||||
GOSSIP_OPTION_NONE = 0, //UNIT_NPC_FLAG_NONE (0)
|
GOSSIP_OPTION_NONE = 0, // UNIT_NPC_FLAG_NONE (0)
|
||||||
GOSSIP_OPTION_GOSSIP = 1, //UNIT_NPC_FLAG_GOSSIP (1)
|
GOSSIP_OPTION_GOSSIP = 1, // UNIT_NPC_FLAG_GOSSIP (1)
|
||||||
GOSSIP_OPTION_QUESTGIVER = 2, //UNIT_NPC_FLAG_QUESTGIVER (2)
|
GOSSIP_OPTION_QUESTGIVER = 2, // UNIT_NPC_FLAG_QUESTGIVER (2)
|
||||||
GOSSIP_OPTION_VENDOR = 3, //UNIT_NPC_FLAG_VENDOR (128)
|
GOSSIP_OPTION_VENDOR = 3, // UNIT_NPC_FLAG_VENDOR (128)
|
||||||
GOSSIP_OPTION_TAXIVENDOR = 4, //UNIT_NPC_FLAG_TAXIVENDOR (8192)
|
GOSSIP_OPTION_TAXIVENDOR = 4, // UNIT_NPC_FLAG_TAXIVENDOR (8192)
|
||||||
GOSSIP_OPTION_TRAINER = 5, //UNIT_NPC_FLAG_TRAINER (16)
|
GOSSIP_OPTION_TRAINER = 5, // UNIT_NPC_FLAG_TRAINER (16)
|
||||||
GOSSIP_OPTION_SPIRITHEALER = 6, //UNIT_NPC_FLAG_SPIRITHEALER (16384)
|
GOSSIP_OPTION_SPIRITHEALER = 6, // UNIT_NPC_FLAG_SPIRITHEALER (16384)
|
||||||
GOSSIP_OPTION_SPIRITGUIDE = 7, //UNIT_NPC_FLAG_SPIRITGUIDE (32768)
|
GOSSIP_OPTION_SPIRITGUIDE = 7, // UNIT_NPC_FLAG_SPIRITGUIDE (32768)
|
||||||
GOSSIP_OPTION_INNKEEPER = 8, //UNIT_NPC_FLAG_INNKEEPER (65536)
|
GOSSIP_OPTION_INNKEEPER = 8, // UNIT_NPC_FLAG_INNKEEPER (65536)
|
||||||
GOSSIP_OPTION_BANKER = 9, //UNIT_NPC_FLAG_BANKER (131072)
|
GOSSIP_OPTION_BANKER = 9, // UNIT_NPC_FLAG_BANKER (131072)
|
||||||
GOSSIP_OPTION_PETITIONER = 10, //UNIT_NPC_FLAG_PETITIONER (262144)
|
GOSSIP_OPTION_PETITIONER = 10, // UNIT_NPC_FLAG_PETITIONER (262144)
|
||||||
GOSSIP_OPTION_TABARDDESIGNER = 11, //UNIT_NPC_FLAG_TABARDDESIGNER (524288)
|
GOSSIP_OPTION_TABARDDESIGNER = 11, // UNIT_NPC_FLAG_TABARDDESIGNER (524288)
|
||||||
GOSSIP_OPTION_BATTLEFIELD = 12, //UNIT_NPC_FLAG_BATTLEFIELDPERSON (1048576)
|
GOSSIP_OPTION_BATTLEFIELD = 12, // UNIT_NPC_FLAG_BATTLEFIELDPERSON (1048576)
|
||||||
GOSSIP_OPTION_AUCTIONEER = 13, //UNIT_NPC_FLAG_AUCTIONEER (2097152)
|
GOSSIP_OPTION_AUCTIONEER = 13, // UNIT_NPC_FLAG_AUCTIONEER (2097152)
|
||||||
GOSSIP_OPTION_STABLEPET = 14, //UNIT_NPC_FLAG_STABLE (4194304)
|
GOSSIP_OPTION_STABLEPET = 14, // UNIT_NPC_FLAG_STABLE (4194304)
|
||||||
GOSSIP_OPTION_ARMORER = 15, //UNIT_NPC_FLAG_ARMORER (4096)
|
GOSSIP_OPTION_ARMORER = 15, // UNIT_NPC_FLAG_ARMORER (4096)
|
||||||
GOSSIP_OPTION_UNLEARNTALENTS = 16, //UNIT_NPC_FLAG_TRAINER (16) (bonus option for GOSSIP_OPTION_TRAINER)
|
GOSSIP_OPTION_UNLEARNTALENTS = 16, // UNIT_NPC_FLAG_TRAINER (16) (bonus option for GOSSIP_OPTION_TRAINER)
|
||||||
GOSSIP_OPTION_UNLEARNPETSKILLS = 17, //UNIT_NPC_FLAG_TRAINER (16) (bonus option for GOSSIP_OPTION_TRAINER)
|
GOSSIP_OPTION_UNLEARNPETSKILLS = 17, // UNIT_NPC_FLAG_TRAINER (16) (bonus option for GOSSIP_OPTION_TRAINER)
|
||||||
|
GOSSIP_OPTION_MAILBOX = 18, // UNIT_NPC_FLAG_GOSSIP (1)
|
||||||
GOSSIP_OPTION_MAX
|
GOSSIP_OPTION_MAX
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13014,6 +13014,7 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
|
||||||
case GOSSIP_OPTION_PETITIONER:
|
case GOSSIP_OPTION_PETITIONER:
|
||||||
case GOSSIP_OPTION_TABARDDESIGNER:
|
case GOSSIP_OPTION_TABARDDESIGNER:
|
||||||
case GOSSIP_OPTION_AUCTIONEER:
|
case GOSSIP_OPTION_AUCTIONEER:
|
||||||
|
case GOSSIP_OPTION_MAILBOX:
|
||||||
break; // no checks
|
break; // no checks
|
||||||
default:
|
default:
|
||||||
sLog.outErrorDb("Creature entry %u have unknown gossip option %u for menu %u", pCreature->GetEntry(), itr->second.option_id, itr->second.menu_id);
|
sLog.outErrorDb("Creature entry %u have unknown gossip option %u for menu %u", pCreature->GetEntry(), itr->second.option_id, itr->second.menu_id);
|
||||||
|
|
@ -13240,6 +13241,10 @@ void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 me
|
||||||
case GOSSIP_OPTION_AUCTIONEER:
|
case GOSSIP_OPTION_AUCTIONEER:
|
||||||
GetSession()->SendAuctionHello(((Creature*)pSource));
|
GetSession()->SendAuctionHello(((Creature*)pSource));
|
||||||
break;
|
break;
|
||||||
|
case GOSSIP_OPTION_MAILBOX:
|
||||||
|
PlayerTalkClass->CloseGossip();
|
||||||
|
GetSession()->SendShowMailBox(guid);
|
||||||
|
break;
|
||||||
case GOSSIP_OPTION_SPIRITGUIDE:
|
case GOSSIP_OPTION_SPIRITGUIDE:
|
||||||
PrepareGossipMenu(pSource);
|
PrepareGossipMenu(pSource);
|
||||||
SendPreparedGossip(pSource);
|
SendPreparedGossip(pSource);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "11866"
|
#define REVISION_NR "11867"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue