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

[refac] Move WarpLocation to Transport.hpp

Browse Source
This commit is contained in:
gsemaj 2021-05-01 11:06:48 -04:00 committed by Gent Semaj
parent f58c6b72b3
commit a0e758f5b7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/NPCManager.hpp
View File

@ -3,6 +3,7 @@
#include "core/Core.hpp" #include "core/Core.hpp"
#include "PlayerManager.hpp" #include "PlayerManager.hpp"
#include "NPC.hpp" #include "NPC.hpp"
#include "Transport.hpp"
#include "JSON.hpp" #include "JSON.hpp"
@ -28,10 +29,7 @@ struct NPCEvent {
: npcType(t), trigger(tr), handler(hndlr) {} : npcType(t), trigger(tr), handler(hndlr) {}
}; };
// this should really be called vec3 or something... struct WarpLocation;
struct WarpLocation {
int x, y, z, instanceID, isInstance, limitTaskID, npcID;
};
namespace NPCManager { namespace NPCManager {
extern std::unordered_map<int32_t, BaseNPC*> NPCs; extern std::unordered_map<int32_t, BaseNPC*> NPCs;

5
src/Transport.hpp
View File

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "servers/CNShardServer.hpp" #include "servers/CNShardServer.hpp"
#include "NPCManager.hpp"
#include <unordered_map> #include <unordered_map>
@ -9,7 +8,9 @@ const int SLIDER_SPEED = 1200;
const int SLIDER_STOP_TICKS = 16; const int SLIDER_STOP_TICKS = 16;
const int SLIDER_GAP_SIZE = 45000; const int SLIDER_GAP_SIZE = 45000;
struct WarpLocation; struct WarpLocation {
int x, y, z, instanceID, isInstance, limitTaskID, npcID;
};
struct TransportRoute { struct TransportRoute {
int type, start, end, cost, mssSpeed, mssRouteNum; int type, start, end, cost, mssSpeed, mssRouteNum;