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

Merge branch 'master' of https://github.com/ralucado/WaveGGJ17

Browse source
This commit is contained in:
serk 2017-01-22 01:52:47 +01:00
commit f22f7533cd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
VaporWaveWars/combat.cpp
View file

@ -141,12 +141,12 @@ void Combat::draw(sf::RenderWindow *window) {
void Combat::updateEvents(sf::Event e) { void Combat::updateEvents(sf::Event e) {
if (isPlayerOne()) { 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); bool compasFinish = !player->event(e);
enemyManager(compasFinish); enemyManager(compasFinish);
} }
else if (!ia) { 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); bool compasFinish = !enemy->event(e);
enemyManager(compasFinish); enemyManager(compasFinish);
} }