From 519d7e273fda06ca2a121b8e6acb9067c3af2f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20C=C3=A9r=C3=A8s?= Date: Thu, 7 Apr 2016 14:25:31 +0200 Subject: [PATCH] =?UTF-8?q?correction=20probl=C3=A8me=20de=20la=20musique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 6 ------ src/menu.cpp | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e3d73d6..ea24dd9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,12 +12,6 @@ int main() { std::shared_ptr editor = std::shared_ptr(new Editor(manager)); try { - // ouverture du niveau - std::ifstream file; - file.open("./levels/level1.dat", std::ios::binary | std::ios::in); - editor->load(file); - file.close(); - manager.setView(menu); manager.start(); } catch (const std::exception& exception) { diff --git a/src/menu.cpp b/src/menu.cpp index 0d02b06..435a103 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -2,6 +2,9 @@ Menu::Menu(Manager& manager) : View(manager){ + manager.getResourceManager().setMusic("menu.wav"); + manager.getResourceManager().playMusic(); + //mise en place des propriétés des textes affichés dans le menu choice[0].setFont(manager.getResourceManager().getFont("Raleway-Regular.ttf")); choice[0].setColor(sf::Color::Red);