OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-10-19 11:50:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tdata to patch format, change config constants accordingly

Browse Source
This commit is contained in:
gsemaj
2021-05-01 20:49:54 -04:00
committed by Gent Semaj
parent b2a8b86e4c
commit 59303ba30d
5 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/TableData.cpp
View File

@@ -998,12 +998,12 @@ void TableData::init() {
std::ifstream fstream;
for (int i = 0; i < 7; i++) {
std::pair<json*, std::string>& table = tables[i];
fstream.open(table.second); // open file
fstream.open(settings::TDATADIR + table.second); // open file
if (!fstream.fail()) {
fstream >> *table.first; // load file contents into table
} else {
if (i != 6) { // gruntwork isn't critical
std::cerr << "[FATAL] Critical tdata file missing: " << table.second << std::endl;
std::cerr << "[FATAL] Critical tdata file missing: " << settings::TDATADIR << table.second << std::endl;
exit(1);
}
}

29
src/settings.cpp
View File

@@ -30,18 +30,24 @@ int settings::SPAWN_X = 19835;
int settings::SPAWN_Y = 108682;
int settings::SPAWN_Z = 8450;
#endif
int settings::SPAWN_ANGLE = 130;
std::string settings::NPCJSON = "tdata/NPCs.json";
std::string settings::MOBJSON = "tdata/mobs.json";
std::string settings::EGGSJSON = "tdata/eggs.json";
std::string settings::GRUNTWORKJSON = "tdata/gruntwork.json";
std::string settings::MOTDSTRING = "Welcome to OpenFusion!";
std::string settings::DBPATH = "database.db";
std::string settings::PATCHPATH = "tdata/patch";
std::string settings::DROPSJSON = "tdata/drops.json";
std::string settings::XDTJSON = "tdata/xdt.json";
std::string settings::PATHJSON = "tdata/paths.json";
std::string settings::TDATADIR = "tdata/";
std::string settings::PATCHDIR = "tdata/patch/";
std::string settings::NPCJSON = "NPCs.json";
std::string settings::MOBJSON = "mobs.json";
std::string settings::EGGSJSON = "eggs.json";
std::string settings::GRUNTWORKJSON = "gruntwork.json";
std::string settings::MOTDSTRING = "Welcome to OpenFusion!";
std::string settings::DROPSJSON = "drops.json";
std::string settings::PATHJSON = "paths.json";
#ifdef ACADEMY
std::string settings::XDTJSON = "xdt1013.json";
#else
std::string settings::XDTJSON = "xdt.json";
#endif // ACADEMY
int settings::ACCLEVEL = 1;
bool settings::DISABLEFIRSTUSEFLAG = true;
@@ -88,7 +94,8 @@ void settings::init() {
GRUNTWORKJSON = reader.Get("shard", "gruntwork", GRUNTWORKJSON);
MOTDSTRING = reader.Get("shard", "motd", MOTDSTRING);
DBPATH = reader.Get("shard", "dbpath", DBPATH);
PATCHPATH = reader.Get("shard", "patchpath", PATCHPATH);
TDATADIR = reader.Get("shard", "tdatadir", TDATADIR);
PATCHDIR = reader.Get("shard", "patchdir", PATCHDIR);
ACCLEVEL = reader.GetInteger("shard", "accountlevel", ACCLEVEL);
EVENTMODE = reader.GetInteger("shard", "eventmode", EVENTMODE);
DISABLEFIRSTUSEFLAG = reader.GetBoolean("shard", "disablefirstuseflag", DISABLEFIRSTUSEFLAG);

3
src/settings.hpp
View File

@@ -24,7 +24,8 @@ namespace settings {
extern std::string EGGSJSON;
extern std::string GRUNTWORKJSON;
extern std::string DBPATH;
extern std::string PATCHPATH;
extern std::string PATCHDIR;
extern std::string TDATADIR;
extern int EVENTMODE;
extern bool MONITORENABLED;
extern int MONITORPORT;