Fix several GCC warnings

This commit is contained in:
j883376
2013-05-23 20:22:42 -04:00
parent f51f6e00c4
commit d6ff01d63c
27 changed files with 106 additions and 90 deletions
+2 -2
View File
@@ -5062,7 +5062,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) {
@@ -5586,7 +5586,7 @@ bool Merc::Suspend() {
}
bool Merc::Unsuspend(bool setMaxStats) {
Client* mercOwner;
Client* mercOwner = nullptr;
bool loaded = false;
if(GetMercOwner()) {