pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-09 13:22:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/EQEmu/Server

Browse Source
This commit is contained in:
Arthur Ice 2013-03-03 15:22:52 -08:00
commit 68338dace1
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/bot.cpp
View File

@ -15372,7 +15372,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
if(!strcasecmp(sep->arg[1], "stance")) { if(!strcasecmp(sep->arg[1], "stance")) {
if(sep->argnum == 3){ if(sep->argnum == 3){
Bot* tempBot; Bot* tempBot = NULL;
std::string botName = std::string(sep->arg[2]); std::string botName = std::string(sep->arg[2]);
if(!botName.empty()) if(!botName.empty())

5
zone/client_packet.cpp
View File

@ -13503,12 +13503,11 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
} }
NPC* tar = entity_list.GetNPCByID(merchant_id); NPC* tar = entity_list.GetNPCByID(merchant_id);
if(tar) { if(tar) {
int mercTypeCount = 0; int mercTypeCount = 0;
int mercCount = 0; int mercCount = 0;
MercenaryMerchantList_Struct* mml = new MercenaryMerchantList_Struct;
if(DistNoRoot(*tar) > USE_NPC_RANGE2) if(DistNoRoot(*tar) > USE_NPC_RANGE2)
return; return;
@ -13516,6 +13515,8 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
return; return;
} }
MercenaryMerchantList_Struct* mml = new MercenaryMerchantList_Struct;
mercTypeCount = tar->GetNumMercTypes(GetClientVersion()); mercTypeCount = tar->GetNumMercTypes(GetClientVersion());
mercCount = tar->GetNumMercs(GetClientVersion()); mercCount = tar->GetNumMercs(GetClientVersion());

5
zone/merc.cpp
View File

@ -5166,11 +5166,8 @@ bool Merc::Unsuspend(bool setMaxStats) {
} }
bool Merc::Dismiss(){ bool Merc::Dismiss(){
Client* mercOwner;
if(GetMercOwner()) { Client* mercOwner = GetMercOwner();
mercOwner = GetMercOwner();
}
if(!mercOwner) if(!mercOwner)
return false; return false;