From 2cc2a1ce61e6162b231a9e3441fe48c2c6062394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= Date: Fri, 8 Apr 2016 16:28:56 +0200 Subject: [PATCH] Correction compat avec MacOS --- include/menu.hpp | 3 +-- src/collision.cpp | 1 + src/editor.cpp | 5 ++--- src/object.cpp | 3 +-- src/util/widget_selector.cpp | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/menu.hpp b/include/menu.hpp index d22842d..f96616c 100644 --- a/include/menu.hpp +++ b/include/menu.hpp @@ -1,13 +1,12 @@ #ifndef __PTF_MENU_HPP__ #define __PTF_MENU_HPP__ -#include -#include #include "manager.hpp" #include "game.hpp" #include "editor.hpp" #include "view.hpp" #include "resource_manager.hpp" +#include #include #define NB_CHOICES 4 diff --git a/src/collision.cpp b/src/collision.cpp index df61fa8..87ee419 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -4,6 +4,7 @@ #include "object.hpp" #include #include +#include /** * Détermination des informations sur une collision entre diff --git a/src/editor.cpp b/src/editor.cpp index 963e71b..1076f2d 100644 --- a/src/editor.cpp +++ b/src/editor.cpp @@ -1,10 +1,9 @@ -#include -#include -#include #include "editor.hpp" #include "game.hpp" #include "block.hpp" #include "constants.hpp" +#include +#include const sf::Color SELECTION_COLOR = sf::Color(33, 33, 33, 40); const sf::Color SELECTION_BORDER_COLOR = sf::Color(33, 33, 33, 127); diff --git a/src/object.cpp b/src/object.cpp index 8059617..c5e67dd 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -1,8 +1,7 @@ -#include -#include #include "object.hpp" #include "constants.hpp" #include "collision.hpp" +#include const unsigned int Object::PROP_MASS = 1; const unsigned int Object::PROP_CHARGE = 2; diff --git a/src/util/widget_selector.cpp b/src/util/widget_selector.cpp index 1cd2b00..a5c7673 100644 --- a/src/util/widget_selector.cpp +++ b/src/util/widget_selector.cpp @@ -1,6 +1,5 @@ -#include -#include #include "util/widget_selector.hpp" +#include const int PADDING = 8;