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

NPC data was being read from the config, but ignored.
This commit is contained in:
2020-08-25 03:45:04 +02:00
parent 6f1a72ca0f
commit 113ce0af07
4 changed files with 7 additions and 2 deletions

View File

@@ -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);
}