From 279c401f4d85f68a71846da3143b7ff7d6369ce8 Mon Sep 17 00:00:00 2001 From: serk Date: Sat, 21 Jan 2017 11:09:41 +0100 Subject: [PATCH] ? --- VaporWaveWars/combat.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp index be305c9..5b3543b 100644 --- a/VaporWaveWars/combat.cpp +++ b/VaporWaveWars/combat.cpp @@ -1,10 +1,12 @@ #include "combat.hpp" Combat::Combat() { +// ia = false; ia = true; attacking = playerOneTurn = true; player = new Player(0); enemy = new IaEnemy(1); +// enemy = new Player(1); initShader(); } @@ -34,9 +36,9 @@ void Combat::update(float deltaTime, sf::RenderWindow *window) { } void Combat::draw(sf::RenderWindow *window) { + window->draw(_background, &_shader); player->draw(window); enemy->draw(window); - window->draw(_background, &_shader); } void Combat::updateEvents(sf::Event e) {