afegit AnimatedSprite::getCurrentAnimationFrame()
fix: player2.gif faltava el outline noves veus i arreglo d'altres style: fitxer de config
This commit is contained in:
@@ -182,7 +182,7 @@ void Player::move() {
|
||||
handleWaitingMovement();
|
||||
break;
|
||||
case State::RECOVER:
|
||||
handleThankYouMovement();
|
||||
handleRecoverMovement();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -201,11 +201,9 @@ void Player::handlePlayingMovement() {
|
||||
shiftSprite();
|
||||
}
|
||||
|
||||
void Player::handleThankYouMovement() {
|
||||
// Si termina la animacion, cambia de estado
|
||||
if (player_sprite_->animationIsCompleted()) {
|
||||
setPlayingState(State::RESPAWNING);
|
||||
}
|
||||
void Player::handleRecoverMovement() {
|
||||
if (player_sprite_->getCurrentAnimationFrame() == 10) { playSound("voice_brbrbr.wav"); }
|
||||
if (player_sprite_->animationIsCompleted()) { setPlayingState(State::RESPAWNING); }
|
||||
}
|
||||
|
||||
void Player::handleRollingMovement() {
|
||||
@@ -641,10 +639,10 @@ void Player::setPlayingState(State state) {
|
||||
|
||||
switch (playing_state_) {
|
||||
case State::RECOVER: {
|
||||
playSound("voice_thankyou.wav");
|
||||
break;
|
||||
}
|
||||
case State::RESPAWNING: {
|
||||
playSound("voice_thankyou.wav");
|
||||
setPlayingState(State::PLAYING);
|
||||
setInvulnerable(true);
|
||||
break;
|
||||
@@ -708,7 +706,7 @@ void Player::setPlayingState(State state) {
|
||||
case State::TITLE_ANIMATION: {
|
||||
// Activa la animación de rodar
|
||||
player_sprite_->setCurrentAnimation("walk");
|
||||
playSound("voice_thankyou.wav");
|
||||
playSound("voice_credit_thankyou.wav");
|
||||
break;
|
||||
}
|
||||
case State::TITLE_HIDDEN: {
|
||||
@@ -947,7 +945,6 @@ void Player::playSound(const std::string &name) const {
|
||||
|
||||
// Indica si se puede dibujar el objeto
|
||||
auto Player::isRenderable() const -> bool {
|
||||
// return !isGameOver() && !isTitleHidden();
|
||||
return !isTitleHidden();
|
||||
};
|
||||
|
||||
@@ -965,4 +962,9 @@ void Player::addScoreToScoreBoard() const {
|
||||
}
|
||||
|
||||
manager->saveToFile(Asset::get()->get("score.bin"));
|
||||
}
|
||||
|
||||
void Player::addCredit() {
|
||||
++credits_used_;
|
||||
playSound("credit.wav");
|
||||
}
|
||||
Reference in New Issue
Block a user