for the merge

This commit is contained in:
serk 2017-01-21 04:32:54 +01:00
parent 05abe3c50a
commit 8a38afc7e7
2 changed files with 3 additions and 1 deletions

View file

@ -25,7 +25,6 @@ void Combat::draw(sf::RenderWindow *window) {
}
void Combat::updateEvents(sf::Event e) {
// std::cout << "hellow" << std::endl;
if (playerOneTurn) playerOneTurn = player.event(e);
else if (!ia) playerOneTurn = !enemy->event(e);
}

View file

@ -23,6 +23,9 @@ private:
bool playerOneTurn, ia;
Player player;
Actor *enemy;
sf::Sprite _background;
static sf::Shader _shader;
};
#endif // COMBAT_H