vylion/WaveGGJ17
vylion/WaveGGJ17
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

for the merge

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
VaporWaveWars/combat.cpp
View file

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

3
VaporWaveWars/combat.hpp
View file

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