summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/network/Network.cpp (renamed from code/Network.cpp)2
-rw-r--r--src/network/Network.hpp (renamed from code/Network.hpp)2
-rw-r--r--src/network/NetworkClient.cpp (renamed from code/NetworkClient.cpp)6
-rw-r--r--src/network/NetworkClient.hpp (renamed from NetworkClient.hpp)0
4 files changed, 5 insertions, 5 deletions
diff --git a/code/Network.cpp b/src/network/Network.cpp
index d979037..a3023ff 100644
--- a/code/Network.cpp
+++ b/src/network/Network.cpp
@@ -1,6 +1,6 @@
#include <iostream>
#include "Network.hpp"
-#include "PacketBuilder.hpp"
+#include "../packet/PacketBuilder.hpp"
Network::Network(std::string address, unsigned short port) : m_address(address), m_port(port) {
std::cout << "Connecting to server " << m_address << ":" << m_port << std::endl;
diff --git a/code/Network.hpp b/src/network/Network.hpp
index 74df92c..ea9042c 100644
--- a/code/Network.hpp
+++ b/src/network/Network.hpp
@@ -2,7 +2,7 @@
#include <string>
#include <SFML/Network.hpp>
-#include "Packet.hpp"
+#include "../packet/Packet.hpp"
class Network {
diff --git a/code/NetworkClient.cpp b/src/network/NetworkClient.cpp
index d6835e0..cbe705b 100644
--- a/code/NetworkClient.cpp
+++ b/src/network/NetworkClient.cpp
@@ -1,7 +1,7 @@
#include "NetworkClient.hpp"
-#include "PacketParser.hpp"
-#include "PacketBuilder.hpp"
-#include "json.hpp"
+#include "../packet/PacketParser.hpp"
+#include "../packet/PacketBuilder.hpp"
+#include <nlohmann/json.hpp>
ServerInfo NetworkClient::ServerPing(std::string address, unsigned short port) {
ServerInfo info;
diff --git a/NetworkClient.hpp b/src/network/NetworkClient.hpp
index a41b5f4..a41b5f4 100644
--- a/NetworkClient.hpp
+++ b/src/network/NetworkClient.hpp