From 2fa629eedf36650ab8dede6ea15c3b37b29530e0 Mon Sep 17 00:00:00 2001
From: Ralusama19 <ralucris.v@gmail.com>
Date: Sun, 22 Jan 2017 01:19:08 +0100
Subject: [PATCH] perfect wave

---
 VaporWaveWars/combat.cpp | 9 +++++++--
 VaporWaveWars/combat.hpp | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp
index 7eb3711..f051d2f 100644
--- a/VaporWaveWars/combat.cpp
+++ b/VaporWaveWars/combat.cpp
@@ -9,6 +9,10 @@ Combat::Combat() {
     enemy = new Player(1);
     scorePlayer = new Score(0);
     scoreEnemy = new Score(1);
+    ASSERT(axisT.loadFromFile(WORK_DIR+"Resources/axis.png"));
+    _axis.setTexture(axisT);
+    _axis.setOrigin(axisT.getSize().x/2,axisT.getSize().y);
+    _axis.setPosition(W_WIDTH/2,W_HEIGHT/2+18);
     initShader();
     SoundManager::load();
     SoundManager::playMusic("music");
@@ -106,6 +110,7 @@ void Combat::draw(sf::RenderWindow *window) {
     window->draw(_halo, &_shaderHalo);
     scorePlayer->draw(window);
     scoreEnemy->draw(window);
+    window->draw(_axis);
     for(std::vector<Wave*>::iterator w = waves.begin(); w != waves.end(); ++w){
         window->draw(*(*w));
     }
@@ -166,8 +171,8 @@ void Combat::doMahWaves(bool p){
             //else w->setPosition(512-512*anterior,500);
             w->setPosition(anterior,200);
             if(i<notes.size()) {
-                if(!p) anterior += 184*notes[i+1];
-                else anterior -= 184*notes[i+1];
+                if(!p) anterior += 176*notes[i+1];
+                else anterior -= 176*notes[i+1];
             }
             waves.push_back(w);
         }
diff --git a/VaporWaveWars/combat.hpp b/VaporWaveWars/combat.hpp
index 368255f..fb329b3 100644
--- a/VaporWaveWars/combat.hpp
+++ b/VaporWaveWars/combat.hpp
@@ -28,8 +28,8 @@ class Combat : public Scene {
         float time;
 
         std::vector<Wave*> waves;
-        sf::Texture _text, _haloT, _plataformT;
-        sf::Sprite _background, _halo, _plataform;
+        sf::Texture _text, _haloT, _plataformT, axisT;
+        sf::Sprite _background, _halo, _plataform, _axis;
         sf::Shader _shader, _shaderHalo;
 
         Score *scoreEnemy, *scorePlayer;