From d815176d01687f9e04178c361fe914f512fdf7a9 Mon Sep 17 00:00:00 2001
From: Ralusama19 <ralucris.v@gmail.com>
Date: Sun, 22 Jan 2017 01:53:35 +0100
Subject: [PATCH] ones al miig

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

diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp
index 03b27b3..2a2815f 100644
--- a/VaporWaveWars/combat.cpp
+++ b/VaporWaveWars/combat.cpp
@@ -141,14 +141,14 @@ void Combat::draw(sf::RenderWindow *window) {
 
 void Combat::updateEvents(sf::Event e) {
     if (isPlayerOne()) {
-        if(e.type == sf::Event::KeyPressed && e.key.code == sf::Keyboard::C && !isAttack()) doMahWaves(!isPlayerOne());
         bool compasFinish = !player->event(e);
         enemyManager(compasFinish);
+        if(e.type == sf::Event::KeyPressed && e.key.code == sf::Keyboard::C && !isAttack()) doMahWaves(!isPlayerOne());
     }
     else if (!ia) {
-        if(e.type == sf::Event::KeyPressed && e.key.code == sf::Keyboard::C && !isAttack()) doMahWaves(!isPlayerOne());
         bool compasFinish = !enemy->event(e);
         enemyManager(compasFinish);
+        if(e.type == sf::Event::KeyPressed && e.key.code == sf::Keyboard::C && !isAttack()) doMahWaves(!isPlayerOne());
     }
 }
 
@@ -193,7 +193,7 @@ void Combat::doMahWaves(bool p) {
             Wave* w = new Wave(p);
             //if(!p) w->setPosition(anterior,500);
             //else w->setPosition(512-512*anterior,500);
-            w->setPosition(anterior,200);
+            w->setPosition(anterior,W_HEIGHT/2);
             if(i<notes.size()) {
                 if(!p) anterior += 176*notes[i+1];
                 else anterior -= 176*notes[i+1];
diff --git a/VaporWaveWars/wave.cpp b/VaporWaveWars/wave.cpp
index 94b6a80..30e30ca 100644
--- a/VaporWaveWars/wave.cpp
+++ b/VaporWaveWars/wave.cpp
@@ -11,7 +11,7 @@ Wave::Wave(bool dir){
     direction = dir;
     ASSERT(texture.loadFromFile(spriteFile));
     setTexture(texture);
-    setOrigin(texture.getSize().x/2,0);
+    setOrigin(texture.getSize().x/2,texture.getSize().y/2);
 //    sf::IntRect rect = sf::IntRect(0, 0, texture.getSize().x, texture.getSize().y);
 //    setTextureRect(rect);
 }