Merge branch 'master' of https://github.com/matteodelabre/projet-cmi

2016-04-11 20:02:03 +02:00 · 2016-04-11 20:02:03 +02:00 · 3f9f79188e
parent 72e0e73956 de4ec01e64
commit 3f9f79188e
3 changed files with 5 additions and 1 deletions
--- a/res/levels/mael_level.dat
+++ b/res/levels/mael_level.dat
--- a/res/textures/regles_jeu.png
+++ b/res/textures/regles_jeu.png
--- a/src/menu.cpp
+++ b/src/menu.cpp
@ -175,7 +175,11 @@ void Menu::loadLevelMenu() {
 }

 void Menu::loadRules() {
-    // TODO: coder l'affichage des règles
+    choices.clear();
+    getWindow().clear(sf::Color::Black);
+
+    sf::Texture& texture = getResourceManager().getTexture("regles_jeu.png");
+    background.setTexture(texture);
 }

 void Menu::launchEditor() {