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

Restructure tdata

Browse Source
This commit is contained in:
Gent S 2020-11-23 18:45:28 -05:00
parent 0f1d9cdf1c
commit 8a0d0e0e4c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/TableData.cpp
View File

@ -37,6 +37,7 @@ void TableData::init() {
// read file into json // read file into json
inFile >> npcData; inFile >> npcData;
npcData = npcData["NPCs"];
for (nlohmann::json::iterator _npc = npcData.begin(); _npc != npcData.end(); _npc++) { for (nlohmann::json::iterator _npc = npcData.begin(); _npc != npcData.end(); _npc++) {
auto npc = _npc.value(); auto npc = _npc.value();
int instanceID = npc.find("mapNum") == npc.end() ? INSTANCE_OVERWORLD : (int)npc["mapNum"]; int instanceID = npc.find("mapNum") == npc.end() ? INSTANCE_OVERWORLD : (int)npc["mapNum"];
@ -201,6 +202,7 @@ void TableData::init() {
// read file into json // read file into json
inFile >> npcData; inFile >> npcData;
npcData = npcData["mobs"];
int leaderMob = -1; int leaderMob = -1;
int leaderMobFollowers = 0; int leaderMobFollowers = 0;

2
tdata

@ -1 +1 @@
Subproject commit 68aa9e087131a0effc8548233a19bc49b518e48b Subproject commit 29b4f6afd644840f03eb9b1cba91a183af4fc9f3