Pruning unneeded files

client/in_world.cpp

@@ -25,6 +25,16 @@
 
 using namespace std;
 
+//-------------------------
+//Quick and dirty
+//-------------------------
+
+static std::string itos(int i) {
+	char buffer[20];
+	snprintf(buffer, 20, "%d", i);
+	return std::string(buffer);
+}
+
 //-------------------------
 //Public access members
 //-------------------------

client/in_world.hpp

@@ -24,7 +24,6 @@
 
 #include "base_scene.hpp"
 
-#include "utilities.hpp"
 #include "defines.hpp"
 #include "singleton.hpp"
 #include "packet.hpp"

client/lobby.cpp

@@ -25,6 +25,16 @@
 
 using namespace std;
 
+//-------------------------
+//Quick and dirty
+//-------------------------
+
+static std::string itos(int i) {
+	char buffer[20];
+	snprintf(buffer, 20, "%d", i);
+	return std::string(buffer);
+}
+
 //-------------------------
 //Public access members
 //-------------------------

client/lobby.hpp

@@ -24,11 +24,9 @@
 
 #include "base_scene.hpp"
 
-#include "utilities.hpp"
 #include "defines.hpp"
 #include "singleton.hpp"
 
-#include "server_entry.hpp"
 #include "packet.hpp"
 #include "network_queue.hpp"
 #include "information_manager.hpp"
@@ -42,6 +40,12 @@
 #include <vector>
 #include <string>
 
+struct ServerEntry {
+	std::string name;
+	IPaddress address;
+	//TODO: player count
+};
+
 class Lobby : public BaseScene {
 public:
 	//Public access members

common/client_entry.hpp

@@ -1,32 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef CLIENTENTRY_HPP_
-#define CLIENTENTRY_HPP_
-
-#include "SDL/SDL_net.h"
-
-struct ClientEntry {
-	int index;
-	IPaddress address;
-};
-
-#endif

common/player_entry.hpp

@@ -1,38 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef PLAYERENTRY_HPP_
-#define PLAYERENTRY_HPP_
-
-#include "vector2.hpp"
-
-#include <string>
-
-struct PlayerEntry {
-	int index;
-	int clientIndex;
-	std::string handle;
-	std::string avatar;
-	Vector2 position;
-	Vector2 motion;
-};
-
-#endif

common/server_entry.hpp

@@ -1,35 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SERVERENTRY_HPP_
-#define SERVERENTRY_HPP_
-
-#include "SDL/SDL_net.h"
-
-#include <string>
-
-struct ServerEntry {
-	std::string name;
-	IPaddress address;
-	//TODO: player count
-};
-
-#endif

common/utilities.cpp

@@ -1,30 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "utilities.hpp"
-
-#include <cstdio>
-
-std::string itos(int i) {
-	char buffer[20];
-	snprintf(buffer, 20, "%d", i);
-	return std::string(buffer);
-}

common/utilities.hpp

@@ -1,29 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef UTILITIES_HPP_
-#define UTILITIES_HPP_
-
-#include <string>
-
-std::string itos(int i);
-
-#endif

server/server_application.cpp

@@ -27,6 +27,16 @@
 
 using namespace std;
 
+//-------------------------
+//Quick and dirty
+//-------------------------
+
+static std::string itos(int i) {
+	char buffer[20];
+	snprintf(buffer, 20, "%d", i);
+	return std::string(buffer);
+}
+
 //-------------------------
 //Public access members
 //-------------------------

server/server_application.hpp

@@ -22,14 +22,10 @@
 #ifndef SERVERAPPLICATION_HPP_
 #define SERVERAPPLICATION_HPP_
 
-#include "utilities.hpp"
 #include "packet.hpp"
 #include "singleton.hpp"
 #include "network_queue.hpp"
 
-#include "client_entry.hpp"
-#include "player_entry.hpp"
-
 #include "config_Utility.hpp"
 #include "udp_network_utility.hpp"
 #include "vector2.hpp"
@@ -40,6 +36,20 @@
 #include <string>
 #include <algorithm>
 
+struct ClientEntry {
+	int index;
+	IPaddress address;
+};
+
+struct PlayerEntry {
+	int index;
+	int clientIndex;
+	std::string handle;
+	std::string avatar;
+	Vector2 position;
+	Vector2 motion;
+};
+
 class ServerApplication {
 public:
 	ServerApplication();