Merge branch 'master' into shared_mem

This commit is contained in:
KimLS 2013-02-17 12:32:13 -08:00
commit a192e726d4
2 changed files with 18 additions and 1 deletions

View File

@ -2,6 +2,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
-------------------------------------------------------
== 02/17/2013 ==
Derision: Added optional guildid and minstatus parameters to quest::gmsay(<messsage>, [color], [toworld], [guildid], [minstatus])
Derision: Client version is now returned by the stream proxy as a number.
Derision: Fixed bug where BecomeTrader packets were only being sent to the Trader, not all other clients in the bazaar.
== 02/16/2013 ==
demonstar55: Fix AA reuse timer calc

View File

@ -769,7 +769,22 @@ void Client::Trader_StartTrader() {
safe_delete(outapp);
// Notify other clients we are now in trader mode
SendTraderPacket(this, 0);
outapp= new EQApplicationPacket(OP_BecomeTrader, sizeof(BecomeTrader_Struct));
BecomeTrader_Struct* bts = (BecomeTrader_Struct*)outapp->pBuffer;
bts->Code = 1;
bts->ID = this->GetID();
strn0cpy(bts->Name, GetName(), sizeof(bts->Name));
entity_list.QueueClients(this, outapp, false);
_pkt(TRADING__PACKETS, outapp);
safe_delete(outapp);
}
void Client::Trader_EndTrader() {