diff options
Diffstat (limited to 'src/shyguy.cpp')
| -rw-r--r-- | src/shyguy.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/shyguy.cpp b/src/shyguy.cpp index 5a5dc8d..8f6d6f3 100644 --- a/src/shyguy.cpp +++ b/src/shyguy.cpp @@ -230,7 +230,7 @@ daShyGuy *daShyGuy::build() { if (this->isDown == 0) { hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 2); } - else { // Shy Guy is in throwy mode + else { // Shy Guy is in downed mode hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 0); } @@ -238,10 +238,13 @@ daShyGuy *daShyGuy::build() { apOther->someFlagByte |= 2; if (this->isDown == 0) { this->playEnemyDownSound1(); - doStateChange(stateVar); + if (damage >= 1) { + doStateChange(deathState); } + else { + doStateChange(stateVar); } damage++; } - else { // Shy Guy is in throwy mode - kill it with fire + else { // Shy Guy is in downed mode - kill it with fire this->playEnemyDownSound1(); doStateChange(deathState); } @@ -250,10 +253,13 @@ daShyGuy *daShyGuy::build() { apOther->someFlagByte |= 2; if (this->isDown == 0) { this->playEnemyDownSound1(); - doStateChange(stateVar); + if (damage >= 1) { + doStateChange(deathState); } + else { + doStateChange(stateVar); } damage++; } - else { // Shy Guy is in throwy mode - kill it with fire + else { // Shy Guy is in downed mode - kill it with fire this->playEnemyDownSound1(); doStateChange(deathState); } |