OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
NPC data was being read from the config, but ignored.
This commit is contained in:
dongresource 2020-08-25 03:45:04 +02:00
parent 6f1a72ca0f
commit 113ce0af07
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.ini
View File

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

4
src/NPCManager.cpp
View File

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

2
src/settings.cpp
View File

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

1
src/settings.hpp
View File

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