diff --git a/Resources/Sounds/NotesMod/2.ogg b/Resources/Sounds/NotesMod/2.ogg index 37c63d5..3065ccd 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 deleted file mode 100644 index 119263e..0000000 Binary files a/Resources/Sounds/NotesMod/3.ogg and /dev/null differ diff --git a/Resources/Sounds/NotesMod/4.ogg b/Resources/Sounds/NotesMod/4.ogg deleted file mode 100644 index 3065ccd..0000000 Binary files a/Resources/Sounds/NotesMod/4.ogg and /dev/null differ diff --git a/VaporWaveWars/player.cpp b/VaporWaveWars/player.cpp index 01027d7..778855e 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()%4+1); + std::string sample = "mod"+std::to_string(rand()%2+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 68c1547..109f83b 100644 --- a/VaporWaveWars/soundmanager.cpp +++ b/VaporWaveWars/soundmanager.cpp @@ -49,8 +49,6 @@ 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; @@ -144,10 +142,6 @@ 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 4663e16..aaca2f8 100644 --- a/VaporWaveWars/soundmanager.hpp +++ b/VaporWaveWars/soundmanager.hpp @@ -69,8 +69,6 @@ class SoundManager { static sf::SoundBuffer bona8; static sf::SoundBuffer mod1; static sf::SoundBuffer mod2; - static sf::SoundBuffer mod3; - static sf::SoundBuffer mod4;