summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-07-26 16:53:57 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-07-26 16:53:57 +0200
commitcc7eb035bcdf5a84a5ba907fa50e330dad538871 (patch)
tree85aa3554f38de3df8d1208136b203369cce2d02f /src
parent2017-07-24 (diff)
downloadAltCraft-cc7eb035bcdf5a84a5ba907fa50e330dad538871.tar
AltCraft-cc7eb035bcdf5a84a5ba907fa50e330dad538871.tar.gz
AltCraft-cc7eb035bcdf5a84a5ba907fa50e330dad538871.tar.bz2
AltCraft-cc7eb035bcdf5a84a5ba907fa50e330dad538871.tar.lz
AltCraft-cc7eb035bcdf5a84a5ba907fa50e330dad538871.tar.xz
AltCraft-cc7eb035bcdf5a84a5ba907fa50e330dad538871.tar.zst
AltCraft-cc7eb035bcdf5a84a5ba907fa50e330dad538871.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/Core.hpp2
-rw-r--r--src/graphics/Texture.hpp2
-rw-r--r--src/main.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Core.hpp b/src/core/Core.hpp
index fdbb377..039b3a3 100644
--- a/src/core/Core.hpp
+++ b/src/core/Core.hpp
@@ -4,9 +4,9 @@
#include <tuple>
#include <easylogging++.h>
-#include <SFML/Window.hpp>
#include <GL/glew.h>
#include <glm/gtc/type_ptr.hpp>
+#include <SFML/Window.hpp>
#include <world/GameState.hpp>
#include <core/AssetManager.hpp>
diff --git a/src/graphics/Texture.hpp b/src/graphics/Texture.hpp
index 277806a..5b2afcf 100644
--- a/src/graphics/Texture.hpp
+++ b/src/graphics/Texture.hpp
@@ -1,8 +1,8 @@
#pragma once
-#include <SFML/Graphics.hpp>
#include <easylogging++.h>
#include <GL/glew.h>
+#include <SFML/Graphics.hpp>
class Texture {
Texture(Texture&);
diff --git a/src/main.cpp b/src/main.cpp
index bcf573b..85fe70d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,7 +26,7 @@ int main() {
el::Loggers::addFlag(el::LoggingFlag::ColoredTerminalOutput);
LOG(INFO) << "Logger is configured";
- LOG(FATAL)<<"Sizeof data is "<<sizeof(EventData);
+ LOG(WARNING)<<"Sizeof EventData is "<<sizeof(EventData);
Core core;
core.Exec();