Server runs, but it's far off from being stable again

client/gameplay_scenes/world_logic.cpp

@@ -58,9 +58,9 @@ World::World(int* const argClientIndex,	int* const argAccountIndex):
 
 	//set the button positions
 	disconnectButton.SetX(50);
-	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
+	disconnectButton.SetY(50);
 	shutdownButton.SetX(50);
-	shutdownButton.SetY(50 + buttonImage.GetClipH() * 1);
+	shutdownButton.SetY(70);
 
 	//load the tilesheet
 	//TODO: (2) Tile size and tile sheet should be loaded elsewhere

makefile

@@ -8,7 +8,7 @@ OUTDIR=out
 
 all: $(OUTDIR)
 	$(MAKE) -C common
-#	$(MAKE) -C server
+	$(MAKE) -C server
 	$(MAKE) -C client
 
 debug: export CXXFLAGS+=-g

server/clients/client_data.hpp

@@ -21,7 +21,7 @@
 */
 #pragma once
 
-#include "SDL_net.h"
+#include "SDL2/SDL_net.h"
 
 #include <chrono>
 

server/clients/client_manager.hpp

@@ -25,7 +25,7 @@
 #include "server_packet.hpp"
 #include "singleton.hpp"
 
-#include "SDL_net.h"
+#include "SDL2/SDL_net.h"
 
 #include <functional>
 #include <list>