Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kayne Ruse
2015-08-20 23:24:20 +10:00
parent 3d6509b5a5
commit 915660da0e
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/gameplay_scenes/world_logic.cpp
+2 -2
View File
@@ -58,9 +58,9 @@ World::World(int* const argClientIndex, int* const argAccountIndex):
//set the button positions //set the button positions
disconnectButton.SetX(50); disconnectButton.SetX(50);
disconnectButton.SetY(50 + buttonImage.GetClipH() * 0); disconnectButton.SetY(50);
shutdownButton.SetX(50); shutdownButton.SetX(50);
shutdownButton.SetY(50 + buttonImage.GetClipH() * 1); shutdownButton.SetY(70);
//load the tilesheet //load the tilesheet
//TODO: (2) Tile size and tile sheet should be loaded elsewhere //TODO: (2) Tile size and tile sheet should be loaded elsewhere
makefile
+1 -1
View File
@@ -8,7 +8,7 @@ OUTDIR=out
all: $(OUTDIR) all: $(OUTDIR)
$(MAKE) -C common $(MAKE) -C common
# $(MAKE) -C server $(MAKE) -C server
$(MAKE) -C client $(MAKE) -C client
debug: export CXXFLAGS+=-g debug: export CXXFLAGS+=-g
server/clients/client_data.hpp
+1 -1
View File
@@ -21,7 +21,7 @@
*/ */
#pragma once #pragma once
#include "SDL_net.h" #include "SDL2/SDL_net.h"
#include <chrono> #include <chrono>
server/clients/client_manager.hpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "server_packet.hpp" #include "server_packet.hpp"
#include "singleton.hpp" #include "singleton.hpp"
#include "SDL_net.h" #include "SDL2/SDL_net.h"
#include <functional> #include <functional>
#include <list> #include <list>