pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1283 from EQEmu/cleanup/Wformat-overflow

Browse Source 
[Cleanup] Make code -Wformat-overflow safe
This commit is contained in:
Alex
2021-03-05 19:23:48 -08:00
committed by GitHub
parent a1531aa057 0b8220be32
commit d635e69ee3
6 changed files with 23 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+6 -1
View File
@@ -4791,7 +4791,12 @@ Merc* Merc::LoadMerc(Client *c, MercTemplate* merc_template, uint32 merchant_id,
tmpsize = c->GetMercInfo().MercSize;
}
sprintf(npc_type->lastname, "%s's Mercenary", c->GetName());
std::string tmp_lastname = c->GetName();
tmp_lastname += "'s Mercenary";
// not sure what to do if too long
if (tmp_lastname.length() < sizeof(npc_type->lastname))
strn0cpy(npc_type->lastname, tmp_lastname.c_str(), sizeof(npc_type->lastname));
npc_type->gender = tmpgender;
npc_type->size = tmpsize;
npc_type->loottable_id = 0; // Loottable has to be 0, otherwise we'll be leavin' some corpses!