summaryrefslogtreecommitdiff
path: root/src/bossBalboaWrench.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/bossBalboaWrench.cpp')
-rw-r--r--src/bossBalboaWrench.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/bossBalboaWrench.cpp b/src/bossBalboaWrench.cpp
index acdbb44..1db7496 100644
--- a/src/bossBalboaWrench.cpp
+++ b/src/bossBalboaWrench.cpp
@@ -66,9 +66,6 @@ daBalboa_c *daBalboa_c::build() {
}
-extern "C" void *HandleXSpeed(daBalboa_c *);
-extern "C" void *HandleYSpeed(daBalboa_c *);
-extern "C" void *UpdateObjectPosBasedOnSpeedValues_real(daBalboa_c *);
extern "C" u32 GenerateRandomNumber(int max);
extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(daBalboa_c *, Vec pos);
@@ -120,10 +117,10 @@ void daBalboa_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther)
//FIXME hack to make multiple playerCollisions work
this->isDead = 0;
this->flags_4FC |= (1<<(31-7));
- if(apOther->owner->_38D > 3) {
- OSReport("!!!ATTENTION!!!\napOther->owner->_38D > 3\n");
+ if(apOther->owner->which_player > 3) {
+ OSReport("!!!ATTENTION!!!\napOther->owner->which_player > 3\n");
}else{
- this->counter_504[apOther->owner->_38D] = 0;
+ this->counter_504[apOther->owner->which_player] = 0;
}
}