Merge branch 'master' into nats

Conflicts: zone/loottables.cpp
2026-06-01 14:21:37 +00:00 · 2018-02-16 15:11:21 -08:00
parent dd5ef6523f 27225b6047
commit feec425be9
39 changed files with 1146 additions and 197 deletions
@@ -68,6 +68,7 @@ SET(zone_sources
 	exp.cpp
 	fearpath.cpp
 	forage.cpp
+	global_loot_manager.cpp
 	groups.cpp
 	guild.cpp
 	guild_mgr.cpp
@@ -159,6 +160,7 @@ SET(zone_headers
 	errmsg.h
 	event_codes.h
 	forage.h
+	global_loot_manager.h
 	groups.h
 	guild_mgr.h
 	hate_list.h