pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge master compile fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/entity.cpp
View File

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

2
zone/waypoints.cpp
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; BenchTimer timer;