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

Merge with master

Browse Source
This commit is contained in:
KimLS
2013-05-24 01:23:58 -07:00
parent a3e24b6854 52b8c0e078
commit e47de5deed
54 changed files with 572 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+2 -2
View File
@@ -5009,7 +5009,7 @@ Merc* Merc::LoadMerc(Client *c, MercTemplate* merc_template, uint32 merchant_id,
snprintf(c->GetEPP().merc_name, 64, "%s", c->GetMercInfo().merc_name);
snprintf(npc_type->name, 64, "%s", c->GetMercInfo().merc_name);
}
uint8 gender;
uint8 gender = 0;
if(merchant_id > 0) {
NPC* tar = entity_list.GetNPCByID(merchant_id);
if(tar) {
@@ -5533,7 +5533,7 @@ bool Merc::Suspend() {
}
bool Merc::Unsuspend(bool setMaxStats) {
Client* mercOwner;
Client* mercOwner = nullptr;
bool loaded = false;
if(GetMercOwner()) {