From 3134dac3c57acabbd0388c8f17dfd0d5c4c791d1 Mon Sep 17 00:00:00 2001 From: Ralusama19 Date: Sun, 22 Jan 2017 01:28:49 +0100 Subject: [PATCH] fixed waves. AGAIN. --- VaporWaveWars/combat.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp index 9ec3553..03b27b3 100644 --- a/VaporWaveWars/combat.cpp +++ b/VaporWaveWars/combat.cpp @@ -141,12 +141,12 @@ 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 && !attacking) doMahWaves(!playerOneTurn); + if(e.type == sf::Event::KeyPressed && e.key.code == sf::Keyboard::C && !isAttack()) doMahWaves(!isPlayerOne()); bool compasFinish = !player->event(e); enemyManager(compasFinish); } else if (!ia) { - if(e.type == sf::Event::KeyPressed && e.key.code == sf::Keyboard::C && !attacking) doMahWaves(!playerOneTurn); + if(e.type == sf::Event::KeyPressed && e.key.code == sf::Keyboard::C && !isAttack()) doMahWaves(!isPlayerOne()); bool compasFinish = !enemy->event(e); enemyManager(compasFinish); }