Merge master, pretty close to RC atm

2026-05-19 13:28:25 +00:00 · 2013-06-26 12:52:00 -07:00
parent d2a3c051e5 82f4b4ee53
commit 9e1115f899
36 changed files with 483 additions and 292 deletions
@@ -5730,7 +5730,7 @@ bool Merc::AddMercToGroup(Merc* merc, Group* group) {

 void Client::InitializeMercInfo() {
 	for(int i=0; i<MAXMERCS; i++) {
-		m_mercinfo[i].mercid = 0;
+		m_mercinfo[i] = MercInfo();
 	}
 }