mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-12-22 11:20:05 +00:00
Moved all JSON files into a dedicated data directory.
This commit is contained in:
parent
4df812f996
commit
3b35e0017a
@ -23,9 +23,9 @@ npcdistance=16000
|
||||
# little message players see when they enter the game
|
||||
motd=Welcome to OpenFusion!
|
||||
# NPC json data
|
||||
npcdata=NPCs.json
|
||||
npcdata=data/NPCs.json
|
||||
# warp target json data
|
||||
warpdata=warps.json
|
||||
warpdata=data/warps.json
|
||||
# is everyone a GM?
|
||||
gm=true
|
||||
|
||||
|
@ -37,7 +37,7 @@ void NPCManager::init() {
|
||||
|
||||
// load temporary mob dump
|
||||
try {
|
||||
std::ifstream inFile("mobs.json"); // not in settings, since it's temp
|
||||
std::ifstream inFile("data/mobs.json"); // not in settings, since it's temp
|
||||
nlohmann::json npcData;
|
||||
|
||||
// read file into json
|
||||
|
@ -18,8 +18,8 @@ int settings::SPAWN_X = 179213;
|
||||
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::NPCJSON = "data/NPCs.json";
|
||||
std::string settings::WARPJSON = "data/warps.json";
|
||||
std::string settings::MOTDSTRING = "Welcome to OpenFusion!";
|
||||
bool settings::GM = false;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user