This commit is contained in:
serk 2017-01-21 11:09:41 +01:00
parent 992568fe07
commit 279c401f4d

View file

@ -1,10 +1,12 @@
#include "combat.hpp" #include "combat.hpp"
Combat::Combat() { Combat::Combat() {
// ia = false;
ia = true; ia = true;
attacking = playerOneTurn = true; attacking = playerOneTurn = true;
player = new Player(0); player = new Player(0);
enemy = new IaEnemy(1); enemy = new IaEnemy(1);
// enemy = new Player(1);
initShader(); initShader();
} }
@ -34,9 +36,9 @@ void Combat::update(float deltaTime, sf::RenderWindow *window) {
} }
void Combat::draw(sf::RenderWindow *window) { void Combat::draw(sf::RenderWindow *window) {
window->draw(_background, &_shader);
player->draw(window); player->draw(window);
enemy->draw(window); enemy->draw(window);
window->draw(_background, &_shader);
} }
void Combat::updateEvents(sf::Event e) { void Combat::updateEvents(sf::Event e) {