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

This commit is contained in:
Ralusama19 2017-01-22 14:57:50 +01:00
commit 41ef88d6cb

View file

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