Merge master compile fixes

This commit is contained in:
KimLS 2017-09-17 13:34:35 -07:00
parent fc7623b690
commit cbbfae0cfc
2 changed files with 2 additions and 2 deletions

View File

@ -648,7 +648,7 @@ void EntityList::AddNPC(NPC *npc, bool SendSpawnPacket, bool dontqueue)
parse->EventNPC(EVENT_SPAWN, npc, nullptr, "", 0);
npc->FixZ(1);
npc->FixZ();
uint16 emoteid = npc->GetEmoteID();
if (emoteid != 0)

View File

@ -757,7 +757,7 @@ void Mob::SendToFixZ(float new_x, float new_y, float new_z) {
}
}
void Mob::FixZ(int32 z_find_offset /*= 5*/)
void Mob::FixZ()
{
BenchTimer timer;