Correction compat avec MacOS

This commit is contained in:
Mattéo Delabre 2016-04-08 16:28:56 +02:00
parent b7083b0ebd
commit 2cc2a1ce61
5 changed files with 6 additions and 9 deletions

View File

@ -1,13 +1,12 @@
#ifndef __PTF_MENU_HPP__
#define __PTF_MENU_HPP__
#include <SFML/Audio.hpp>
#include <iostream>
#include "manager.hpp"
#include "game.hpp"
#include "editor.hpp"
#include "view.hpp"
#include "resource_manager.hpp"
#include <SFML/Audio.hpp>
#include <vector>
#define NB_CHOICES 4

View File

@ -4,6 +4,7 @@
#include "object.hpp"
#include <functional>
#include <utility>
#include <cmath>
/**
* Détermination des informations sur une collision entre

View File

@ -1,10 +1,9 @@
#include <iostream>
#include <cmath>
#include <algorithm>
#include "editor.hpp"
#include "game.hpp"
#include "block.hpp"
#include "constants.hpp"
#include <cmath>
#include <algorithm>
const sf::Color SELECTION_COLOR = sf::Color(33, 33, 33, 40);
const sf::Color SELECTION_BORDER_COLOR = sf::Color(33, 33, 33, 127);

View File

@ -1,8 +1,7 @@
#include <cmath>
#include <iostream>
#include "object.hpp"
#include "constants.hpp"
#include "collision.hpp"
#include <cmath>
const unsigned int Object::PROP_MASS = 1;
const unsigned int Object::PROP_CHARGE = 2;

View File

@ -1,6 +1,5 @@
#include <iostream>
#include <utility>
#include "util/widget_selector.hpp"
#include <utility>
const int PADDING = 8;