pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-03 01:06:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into lua

Browse Source 
Conflicts:
	zone/merc.cpp
This commit is contained in:
KimLS
2013-06-27 12:53:47 -07:00
parent d12c700bbf d25205d9d3
commit a5db4310c6
28 changed files with 180 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+1 -1
View File
@@ -5730,7 +5730,7 @@ bool Merc::AddMercToGroup(Merc* merc, Group* group) {
void Client::InitializeMercInfo() {
for(int i=0; i<MAXMERCS; i++) {
m_mercinfo[i] = MercInfo();
m_mercinfo[i].mercid = 0;
}
}