From cbbfae0cfc7885431d720c2aa8d616a558a6a992 Mon Sep 17 00:00:00 2001
From: KimLS <kls@peqtgc.com>
Date: Sun, 17 Sep 2017 13:34:35 -0700
Subject: [PATCH] Merge master compile fixes

---
 zone/entity.cpp    | 2 +-
 zone/waypoints.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zone/entity.cpp b/zone/entity.cpp
index 74dd82e4b..81c857d9d 100644
--- a/zone/entity.cpp
+++ b/zone/entity.cpp
@@ -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)
diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp
index 7e895beeb..0ae09548d 100644
--- a/zone/waypoints.cpp
+++ b/zone/waypoints.cpp
@@ -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;