Load the NPC and warp JSON files according to the config file.

NPC data was being read from the config, but ignored.

config.ini

@@ -23,6 +23,8 @@ view=20000
 motd=Welcome to OpenFusion!
 # NPC json data
 npcdata=NPCs.json
+# warp target json data
+warpdata=warps.json
 
 # spawn coordinates (Z is height)
 # the supplied defaults are at City Hall

src/NPCManager.cpp

@@ -17,7 +17,7 @@ void NPCManager::init() {
     // load NPCs from NPCs.json into our NPC manager
 
     try {
-        std::ifstream inFile("NPCs.json");
+        std::ifstream inFile(settings::NPCJSON);
         nlohmann::json npcData;
 
         // read file into json
@@ -37,7 +37,7 @@ void NPCManager::init() {
     }
 
     try {
-        std::ifstream infile("warps.json");
+        std::ifstream infile(settings::WARPJSON);
         nlohmann::json warpData;
 
         // read file into json

src/settings.cpp

@@ -18,6 +18,7 @@ int settings::SPAWN_Y = 268451;
 int settings::SPAWN_Z = -4210;
 std::string settings::GMPASS = "pass";
 std::string settings::NPCJSON = "NPCs.json";
+std::string settings::WARPJSON = "warps.json";
 std::string settings::MOTDSTRING = "Welcome to OpenFusion!";
 
 void settings::init() {
@@ -43,6 +44,7 @@ void settings::init() {
     SPAWN_Z = reader.GetInteger("shard", "spawnz", SPAWN_Z);
     GMPASS = reader.Get("login", "pass", GMPASS);
     NPCJSON = reader.Get("shard", "npcdata", NPCJSON);
+    WARPJSON = reader.Get("shard", "warpdata", WARPJSON);
     MOTDSTRING = reader.Get("shard", "motd", MOTDSTRING);
 
 }

src/settings.hpp

@@ -12,6 +12,7 @@ namespace settings {
     extern int SPAWN_Z;
     extern std::string MOTDSTRING;
     extern std::string NPCJSON;
+    extern std::string WARPJSON;
     extern std::string GMPASS;
 
     void init();