diff --git a/src/settings.cpp b/src/settings.cpp index 0d721ff..a440cd5 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -30,7 +30,6 @@ int settings::SPAWN_Z = 8450; int settings::SPAWN_ANGLE = 130; std::string settings::NPCJSON = "tdata/NPCs.json"; std::string settings::MOBJSON = "tdata/mobs.json"; -std::string settings::PATHJSON = "tdata/paths.json"; std::string settings::EGGSJSON = "tdata/eggs.json"; std::string settings::GRUNTWORKJSON = "tdata/gruntwork.json"; std::string settings::MOTDSTRING = "Welcome to OpenFusion!"; @@ -40,9 +39,11 @@ std::string settings::ACADEMYJSON = "tdata/1013/academy.json"; #if PROTOCOL_VERSION == 1013 std::string settings::XDTJSON = "tdata/1013/xdt.json"; std::string settings::DROPSJSON = "tdata/1013/drops.json"; +std::string settings::PATHJSON = "tdata/1013/paths.json"; #else std::string settings::DROPSJSON = "tdata/drops.json"; std::string settings::XDTJSON = "tdata/xdt.json"; +std::string settings::PATHJSON = "tdata/paths.json"; #endif int settings::ACCLEVEL = 1; diff --git a/tdata b/tdata index 2d1af8e..c0d525d 160000 --- a/tdata +++ b/tdata @@ -1 +1 @@ -Subproject commit 2d1af8e5d6c91135cc66f85e5ca34b9bbe4a3bb3 +Subproject commit c0d525d9ba93b133f9122b60eb74688badff5003