matteo/skizzle
matteo
/
skizzle
1
0
Fork 0
Code Issues Pull Requests Releases Activity

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

This commit is contained in:
Mattéo Delabre 2016-04-11 20:02:03 +02:00
parent 72e0e73956 de4ec01e64
commit 3f9f79188e
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/levels/mael_level.dat
View File

Binary file not shown.

BIN
res/textures/regles_jeu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1022 KiB

6
src/menu.cpp
View File

@ -175,7 +175,11 @@ void Menu::loadLevelMenu() {
} }
void Menu::loadRules() { 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() { void Menu::launchEditor() {