pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-21 07:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source 
Conflicts:
	zone/client_packet.cpp
	zone/merc.cpp
	zone/npc.cpp
This commit is contained in:
SecretsOTheP
2013-03-23 05:02:27 -04:00
parent 2124b63982 ac040b5197
commit 8e604fd3db
7 changed files with 321 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/npc.cpp
+2 -2
View File
@@ -248,8 +248,8 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float
npc_aggro = d->npc_aggro;
if(!IsMerc()) //memleak fix, this really shouldn't be here
AI_Start();
if(!IsMerc())
AI_Start();
d_meele_texture1 = d->d_meele_texture1;
d_meele_texture2 = d->d_meele_texture2;