Moved random code out of defines.*

This commit is contained in:
Kayne Ruse
2013-06-21 21:36:48 +10:00
parent 89179626be
commit a4d184ca75
11 changed files with 96 additions and 13 deletions
+24
View File
@@ -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"
+32
View File
@@ -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
+1
View File
@@ -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"
+1
View File
@@ -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"
+1 -1
View File
@@ -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);
}
}
+1 -2
View File
@@ -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