Merge pull request #557 from KinglyKrab/master

Added quest global support for zone_controller.
EQEmu · Sep 14, 2016 · 06dfba3 · 06dfba3
2 parents a9070b1 + 8aa942c
commit 06dfba3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/common/ruletypes.h b/common/ruletypes.h
@@ -256,6 +256,7 @@ RULE_INT(Zone, WeatherTimer, 600) // Weather timer when no duration is available
 RULE_BOOL(Zone, EnableLoggedOffReplenishments, true)
 RULE_INT(Zone, MinOfflineTimeToReplenishments, 21600) // 21600 seconds is 6 Hours
 RULE_BOOL(Zone, UseZoneController, true) // Enables the ability to use persistent quest based zone controllers (zone_controller.pl/lua)
+RULE_BOOL(Zone, EnableZoneControllerGlobals, false) // Enables the ability to use quest globals with the zone controller NPC
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Map)

diff --git a/zone/npc.cpp b/zone/npc.cpp
@@ -872,6 +872,10 @@ bool NPC::SpawnZoneController(){
 	npc_type->merchanttype = 0;
 	npc_type->bodytype = 11;
 
+	if (RuleB(Zone, EnableZoneControllerGlobals)) {
+		npc_type->qglobal = true;
+	}
+
 	npc_type->prim_melee_type = 28;
 	npc_type->sec_melee_type = 28;