diff options
Diffstat (limited to 'src/bossKoopaThrow.cpp')
| -rw-r--r-- | src/bossKoopaThrow.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bossKoopaThrow.cpp b/src/bossKoopaThrow.cpp index 85c96ca..3efcc82 100644 --- a/src/bossKoopaThrow.cpp +++ b/src/bossKoopaThrow.cpp @@ -207,14 +207,14 @@ int daKoopaThrow::onCreate() { _324 = currentInfo->size; // These structs tell stupid collider what to collide with - these are from koopa troopa - static const u8 one[16] = {0,0,0,1, 0,0,0xC0,0, 0,0,0x40,0, 0,0,0,0}; - static const u8 two[12] = {0,0,0,0, 0,0,0,0, 0,0,0xC0,0}; - static const u8 three[16] = {0,0,0,1, 0,0,0x60,0, 0,0,0x90,0, 0,0,0x60,0}; + static const lineSensor_s below(12<<12, 4<<12, 0<<12); + static const pointSensor_s above(0<<12, 12<<12); + static const lineSensor_s adjacent(6<<12, 9<<12, 6<<12); - collMgr.Init(this, one, two, three); - collMgr.execute(); + collMgr.init(this, &below, &above, &adjacent); + collMgr.calculateBelowCollisionWithSmokeEffect(); - cmgr_returnValue = collMgr.CollidedWithTile(); + cmgr_returnValue = collMgr.isOnTopOfTile(); if (this->direction == 0) { // Ground Facing Left @@ -297,10 +297,10 @@ void daKoopaThrow::executeState_Straight() { HandleYSpeed(); doSpriteMovement(); - // cmgr_returnValue = collMgr.CollidedWithTile(); - // collMgr.execute(); + // cmgr_returnValue = collMgr.isOnTopOfTile(); + // collMgr.calculateBelowCollisionWithSmokeEffect(); - // if (collMgr.CollidedWithTile() || (collMgr.bitfield_for_checks & (0x15 << direction))) { + // if (collMgr.isOnTopOfTile() || (collMgr.outputMaybe & (0x15 << direction))) { // // hit the ground or wall // PlaySoundAsync(this, currentInfo->breakSound); |