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

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

Browse source
This commit is contained in:
Ralusama19 2017-01-22 14:57:50 +01:00
commit 41ef88d6cb
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
VaporWaveWars/combat.cpp
View file

@ -174,6 +174,9 @@ void Combat::enemyManager(bool compasFinish) { //To do: considerar si hay ia
if(!player->hitBy(compas)) { if(!player->hitBy(compas)) {
scoreEnemy->incrisScore(); scoreEnemy->incrisScore();
} }
else {
scorePlayer->incrisScore();
}
state = CombatState::player_atk; state = CombatState::player_atk;
break; break;
case CombatState::player_atk: case CombatState::player_atk:
@ -188,6 +191,9 @@ void Combat::enemyManager(bool compasFinish) { //To do: considerar si hay ia
if(!enemy->hitBy(compas)) { if(!enemy->hitBy(compas)) {
scorePlayer->incrisScore(); scorePlayer->incrisScore();
} }
else {
scoreEnemy->incrisScore();
}
state = CombatState::enemy_atk; state = CombatState::enemy_atk;
break; break;
case CombatState::enemy_atk: case CombatState::enemy_atk: