Merge branch 'master' of github.com:ralucado/WaveGGJ17
This commit is contained in:
commit
41ef88d6cb
1 changed files with 6 additions and 0 deletions
|
@ -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:
|
||||
|
|
Reference in a new issue