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

Respawn points work now.

Browse Source 
Note that some of them weren't present in clientnpc and will need to be
manually added later.
This commit is contained in:
dongresource
2020-08-25 03:34:53 +02:00
parent d025b611a1
commit d964a83d6d
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/NPCManager.cpp
View File

@@ -5,11 +5,13 @@
#include <algorithm>
#include <list>
#include <fstream>
#include <vector>
#include "contrib/JSON.hpp"
std::map<int32_t, BaseNPC> NPCManager::NPCs;
std::map<int32_t, WarpLocation> NPCManager::Warps;
std::vector<WarpLocation> NPCManager::RespawnPoints;
void NPCManager::init() {
// load NPCs from NPCs.json into our NPC manager
@@ -24,6 +26,9 @@ void NPCManager::init() {
for (nlohmann::json::iterator npc = npcData.begin(); npc != npcData.end(); npc++) {
BaseNPC tmp(npc.value()["x"], npc.value()["y"], npc.value()["z"], npc.value()["id"]);
NPCs[tmp.appearanceData.iNPC_ID] = tmp;
if (npc.value()["id"] == 641 || npc.value()["id"] == 642)
RespawnPoints.push_back({npc.value()["x"], npc.value()["y"], ((int)npc.value()["z"]) + RESURRECT_HEIGHT});
}
std::cout << "[INFO] populated " << NPCs.size() << " NPCs" << std::endl;