summaryrefslogtreecommitdiff
path: root/src/bossSamurshai.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/bossSamurshai.cpp')
-rw-r--r--src/bossSamurshai.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp
index a5b2b30..98470b9 100644
--- a/src/bossSamurshai.cpp
+++ b/src/bossSamurshai.cpp
@@ -111,11 +111,7 @@ daSamurshai *daSamurshai::build() {
char hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 2);
- if (topHurts == true) {
- this->dEn_c::playerCollision(apThis, apOther);
- this->_vf220(apOther->owner);
- }
- else if ((hitType == 1) || (hitType == 3)) {
+ if ((hitType == 1) || (hitType == 3)) {
apOther->someFlagByte |= 2;
if (this->isDown == 0) {
this->playEnemyDownSound1();
@@ -139,11 +135,7 @@ daSamurshai *daSamurshai::build() {
void daSamurshai::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) {
apOther->someFlagByte |= 2;
- if (topHurts == true) {
- this->dEn_c::playerCollision(apThis, apOther);
- this->_vf220(apOther->owner);
- }
- else if (this->isDown == 0) {
+ if (this->isDown == 0) {
damage += 6;
if (damage > 15) { doStateChange(&StateID_Outro); }
else { doStateChange(&StateID_Damage); }
@@ -294,7 +286,7 @@ int daSamurshai::onCreate() {
HitMeBaby.xDistToCenter = 0.0;
HitMeBaby.yDistToCenter = 15.0;
- HitMeBaby.xDistToEdge = 18.0;
+ HitMeBaby.xDistToEdge = 13.0;
HitMeBaby.yDistToEdge = 15.0;
HitMeBaby.category1 = 0x3;