diff --git a/Resources/Sounds/NotesMod/1.ogg b/Resources/Sounds/NotesMod/1.ogg index 9b0f81e..ed8d1a0 100644 Binary files a/Resources/Sounds/NotesMod/1.ogg and b/Resources/Sounds/NotesMod/1.ogg differ diff --git a/Resources/Sounds/NotesMod/2.ogg b/Resources/Sounds/NotesMod/2.ogg index 3065ccd..df7de05 100644 Binary files a/Resources/Sounds/NotesMod/2.ogg and b/Resources/Sounds/NotesMod/2.ogg differ diff --git a/Resources/Sounds/NotesMod/3.ogg b/Resources/Sounds/NotesMod/3.ogg new file mode 100644 index 0000000..a7af376 Binary files /dev/null and b/Resources/Sounds/NotesMod/3.ogg differ diff --git a/Resources/Sounds/NotesMod/4.ogg b/Resources/Sounds/NotesMod/4.ogg new file mode 100644 index 0000000..581ab5e Binary files /dev/null and b/Resources/Sounds/NotesMod/4.ogg differ diff --git a/VaporWaveWars/player.cpp b/VaporWaveWars/player.cpp index 6fd4a12..5bb769c 100644 --- a/VaporWaveWars/player.cpp +++ b/VaporWaveWars/player.cpp @@ -32,7 +32,7 @@ bool Player::event(sf::Event e) { case (sf::Event::KeyPressed): if(e.key.code == sf::Keyboard::C) { - std::string sample = "mod"+std::to_string(rand()%2+1); + std::string sample = "mod"+std::to_string(rand()%4+1); if(!mod) sample = "note"+std::to_string(rand()%4+1); SoundManager::playSound(sample); //std::cout << "playing sample " << sample << std::endl; diff --git a/VaporWaveWars/soundmanager.cpp b/VaporWaveWars/soundmanager.cpp index 109f83b..68c1547 100644 --- a/VaporWaveWars/soundmanager.cpp +++ b/VaporWaveWars/soundmanager.cpp @@ -49,6 +49,8 @@ sf::SoundBuffer SoundManager::bona7; sf::SoundBuffer SoundManager::bona8; sf::SoundBuffer SoundManager::mod1; sf::SoundBuffer SoundManager::mod2; +sf::SoundBuffer SoundManager::mod3; +sf::SoundBuffer SoundManager::mod4; std::map SoundManager::soundMap; std::map SoundManager::musicMap; @@ -142,6 +144,10 @@ void SoundManager::load(){ soundMap["mod1"].setBuffer(mod1); ASSERT(mod2.loadFromFile(WORK_DIR+"Resources/Sounds/NotesMod/2.ogg")); soundMap["mod2"].setBuffer(mod2); + ASSERT(mod3.loadFromFile(WORK_DIR+"Resources/Sounds/NotesMod/3.ogg")); + soundMap["mod3"].setBuffer(mod3); + ASSERT(mod4.loadFromFile(WORK_DIR+"Resources/Sounds/NotesMod/4.ogg")); + soundMap["mod4"].setBuffer(mod4); } diff --git a/VaporWaveWars/soundmanager.hpp b/VaporWaveWars/soundmanager.hpp index aaca2f8..4663e16 100644 --- a/VaporWaveWars/soundmanager.hpp +++ b/VaporWaveWars/soundmanager.hpp @@ -69,6 +69,8 @@ class SoundManager { static sf::SoundBuffer bona8; static sf::SoundBuffer mod1; static sf::SoundBuffer mod2; + static sf::SoundBuffer mod3; + static sf::SoundBuffer mod4;