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 01:53:40 +01:00
commit 526e79c716
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
VaporWaveWars/actor.cpp
View file

@ -26,6 +26,10 @@ bool Actor::update(float deltaTime, sf::RenderWindow *window) {
else if (animate == PlayerState::inMidle) { else if (animate == PlayerState::inMidle) {
if (character->isLastFrame()) animate = PlayerState::idle; if (character->isLastFrame()) animate = PlayerState::idle;
} }
else if (animate == PlayerState::success) {
character->setState(PlayerState::success);
animate = PlayerState::inMidle;
}
return this->updateLogic(deltaTime, window); return this->updateLogic(deltaTime, window);
} }
@ -35,7 +39,11 @@ bool Actor::hitBy(Compas enemy) {
else std::cout << "hit" << std::endl; else std::cout << "hit" << std::endl;
if (!dodge) { if (!dodge) {
character->setState(PlayerState::hurt); character->setState(PlayerState::hurt);
animate = PlayerState::hurt; animate = PlayerState::inMidle;
}
else {
character->setState(PlayerState::success);
animate = PlayerState::inMidle;
} }
return dodge; return dodge;
} }