From 915660da0ee4b5e8c8c1d8729db21e7d730f4aee Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Thu, 20 Aug 2015 23:24:20 +1000 Subject: [PATCH] Server runs, but it's far off from being stable again --- client/gameplay_scenes/world_logic.cpp | 4 ++-- makefile | 2 +- server/clients/client_data.hpp | 2 +- server/clients/client_manager.hpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/gameplay_scenes/world_logic.cpp b/client/gameplay_scenes/world_logic.cpp index e47f275..55d79b8 100644 --- a/client/gameplay_scenes/world_logic.cpp +++ b/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 diff --git a/makefile b/makefile index 61a49ba..f824873 100644 --- a/makefile +++ b/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 diff --git a/server/clients/client_data.hpp b/server/clients/client_data.hpp index bcf7cc8..312ffb3 100644 --- a/server/clients/client_data.hpp +++ b/server/clients/client_data.hpp @@ -21,7 +21,7 @@ */ #pragma once -#include "SDL_net.h" +#include "SDL2/SDL_net.h" #include diff --git a/server/clients/client_manager.hpp b/server/clients/client_manager.hpp index 7a7b930..7f38a53 100644 --- a/server/clients/client_manager.hpp +++ b/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 #include