Moved random code out of defines.*

README.md

@@ -22,7 +22,8 @@ modules
 Studio 2012. Personally, I'm using MinGW 4.7.2.
 * I'm trying to keep this as IDE agnostic as possible, so if you use an IDE,
 please add it's files to .gitignore.
-* You can read more details on the GitHub wiki [here](https://github.com/Ratstail91/Tortuga/wiki).
+* You can read more details on the Tortuga wiki
+[here](https://github.com/Ratstail91/Tortuga/wiki).
 
 ## Copyright
 

client/character.cpp

@@ -0,0 +1,24 @@
+/* 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 "character.hpp"
+
+ 

client/character.hpp

@@ -0,0 +1,32 @@
+/* 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 CHARACTER_HPP_
+ #define CHARACTER_HPP_
+
+class Character {
+public:
+	Character();
+	~Character();
+private:
+};
+
+ #endif

client/in_world.hpp

@@ -23,6 +23,7 @@
 #define INWORLD_HPP_
 
 #include "base_scene.hpp"
+#include "utilities.hpp"
 #include "defines.hpp"
 #include "service_locator.hpp"
 #include "packet_type.hpp"

client/lobby.hpp

@@ -23,6 +23,7 @@
 #define LOBBY_HPP_
 
 #include "base_scene.hpp"
+#include "utilities.hpp"
 #include "defines.hpp"
 #include "service_locator.hpp"
 #include "packet_type.hpp"

client/splash_screen.cpp

@@ -59,7 +59,7 @@ void SplashScreen::RunFrame(double delta) {
 		LoadResources();
 	}
 
-	if (Clock::now() - start > std::chrono::duration<int>(1)) {
+	if (std::chrono::steady_clock::now() - start > std::chrono::duration<int>(1)) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 }

client/splash_screen.hpp

@@ -23,7 +23,6 @@
 #define SPLASHSCREEN_HPP_
 
 #include "base_scene.hpp"
-#include "defines.hpp"
 #include "service_locator.hpp"
 
 #include "config_utility.hpp"
@@ -48,7 +47,7 @@ protected:
 	ConfigUtility* configUtil = ServiceLocator<ConfigUtility>::Get();
 	SurfaceManager* surfaceMgr = ServiceLocator<SurfaceManager>::Get();
 	Image logo;
-	Clock::time_point start = Clock::now();
+	std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
 };
 
 #endif

libs/common/defines.hpp

@@ -22,14 +22,7 @@
 #ifndef DEFINES_HPP_
 #define DEFINES_HPP
 
-#include <chrono>
-#include <string>
-
 #define GAME_CHANNEL 0
 #define CHAT_CHANNEL 1
 
-typedef std::chrono::high_resolution_clock Clock;
-
-std::string itos(int i);
-
 #endif

libs/common/utilities.cpp

@@ -19,7 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "defines.hpp"
+#include "utilities.hpp"
 
 #include <cstdio>
 

libs/common/utilities.hpp

@@ -0,0 +1,29 @@
+/* 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.hpp

@@ -22,7 +22,7 @@
 #ifndef SERVERAPPLICATION_HPP_
 #define SERVERAPPLICATION_HPP_
 
-#include "defines.hpp"
+#include "utilities.hpp"
 #include "packet_type.hpp"
 #include "service_locator.hpp"
 #include "network_queue.hpp"
@@ -37,6 +37,9 @@
 #include <chrono>
 #include <string>
 
+//lazy
+typedef std::chrono::high_resolution_clock Clock;
+
 struct ClientData {
 	int index;
 	int channel;