From 81f7b08d612df87a0411da388f042720786575d8 Mon Sep 17 00:00:00 2001
From: Ralusama19 <ralucris.v@gmail.com>
Date: Sun, 22 Jan 2017 14:57:45 +0100
Subject: [PATCH] note mods

---
 VaporWaveWars/game.cpp         |  2 +-
 VaporWaveWars/player.cpp       |  9 ++++++++-
 VaporWaveWars/player.hpp       |  3 ++-
 VaporWaveWars/soundmanager.cpp | 12 ++++++++++++
 VaporWaveWars/soundmanager.hpp |  4 ++++
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/VaporWaveWars/game.cpp b/VaporWaveWars/game.cpp
index a6ca06c..e6622e8 100644
--- a/VaporWaveWars/game.cpp
+++ b/VaporWaveWars/game.cpp
@@ -20,7 +20,7 @@ Game* Game::i() {
 // Main game loop
 void Game::run() {
     sf::Clock c;
-    sf::RenderWindow window(sf::VideoMode(W_WIDTH, W_HEIGHT), "( ( ( Radio Waves ) ) )", sf::Style::Close);
+    sf::RenderWindow window(sf::VideoMode(W_WIDTH, W_HEIGHT), "( ( ( Radio Wave ) ) )", sf::Style::Close);
     window.setFramerateLimit(25);
     window.setKeyRepeatEnabled(false);
     float oldTime = c.getElapsedTime().asSeconds();
diff --git a/VaporWaveWars/player.cpp b/VaporWaveWars/player.cpp
index 0f9860e..01027d7 100644
--- a/VaporWaveWars/player.cpp
+++ b/VaporWaveWars/player.cpp
@@ -4,20 +4,26 @@ Player::Player(int num) : Actor(num) {
     compas = Compas();
     error = false;
     time = 0;
+    mod = false;
 }
 
 Player::Player() : Actor() {
     compas = Compas();
     error = false;
     time = 0;
+    mod = false;
 }
 
 bool Player::updateLogic(float deltaTime, sf::RenderWindow *window) {
     time += deltaTime;
+    clock += deltaTime;
     if (time > BLACKVALUE) {
         compas.incraeseTime();
         time = 0;
     }
+    if (clock >= 89.15) clock = 0.0;
+    if (!mod && clock > 38.10 && clock < 64) mod = true;
+    else if (mod && clock < 38.10 || clock > 64) mod = false;
     return false;
 }
 
@@ -25,8 +31,9 @@ bool Player::event(sf::Event e) {
     switch(e.type) {
     case (sf::Event::KeyPressed):
         if(e.key.code == sf::Keyboard::C) {
-            std::string sample = "note"+std::to_string(rand()%4+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;
             compas.start();
diff --git a/VaporWaveWars/player.hpp b/VaporWaveWars/player.hpp
index 3286532..0c19e16 100644
--- a/VaporWaveWars/player.hpp
+++ b/VaporWaveWars/player.hpp
@@ -11,10 +11,11 @@ public:
     bool event(sf::Event e) final override;
 protected:
     bool updateLogic(float deltaTime, sf::RenderWindow *window);
-
 private:
     float time;
     bool error;
+    bool mod;
+    float clock = 0.0;
 };
 
 #endif // PLAYER_H
diff --git a/VaporWaveWars/soundmanager.cpp b/VaporWaveWars/soundmanager.cpp
index 9f3eb36..68c1547 100644
--- a/VaporWaveWars/soundmanager.cpp
+++ b/VaporWaveWars/soundmanager.cpp
@@ -47,6 +47,10 @@ sf::SoundBuffer     SoundManager::bona5;
 sf::SoundBuffer     SoundManager::bona6;
 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<std::string, sf::Sound> SoundManager::soundMap;
 std::map<std::string, sf::Music> SoundManager::musicMap;
@@ -136,6 +140,14 @@ void SoundManager::load(){
     soundMap["bona7"].setBuffer(bona7);
     ASSERT(bona8.loadFromFile(WORK_DIR+"Resources/Sounds/Bona/8.ogg"));
     soundMap["bona8"].setBuffer(bona8);
+    ASSERT(mod1.loadFromFile(WORK_DIR+"Resources/Sounds/NotesMod/1.ogg"));
+    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 90bdb69..4663e16 100644
--- a/VaporWaveWars/soundmanager.hpp
+++ b/VaporWaveWars/soundmanager.hpp
@@ -67,6 +67,10 @@ class SoundManager {
         static sf::SoundBuffer     bona6;
         static sf::SoundBuffer     bona7;
         static sf::SoundBuffer     bona8;
+        static sf::SoundBuffer     mod1;
+        static sf::SoundBuffer     mod2;
+        static sf::SoundBuffer     mod3;
+        static sf::SoundBuffer     mod4;