summaryrefslogtreecommitdiff
path: root/src/bossBombDrop.cpp
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-12-02 02:33:34 +0100
committerTreeki <treeki@gmail.com>2012-12-02 02:33:34 +0100
commit15af665eac26f9a29b864617d571ef539a6c42b0 (patch)
tree51505a63f6160cde691b3b9df15303d8b98fa0a1 /src/bossBombDrop.cpp
parent25bb4867ecfde3ec489b891b182cc0fdd2711ad3 (diff)
downloadkamek-15af665eac26f9a29b864617d571ef539a6c42b0.tar.gz
kamek-15af665eac26f9a29b864617d571ef539a6c42b0.zip
collisionMgr_c updated
Diffstat (limited to '')
-rw-r--r--src/bossBombDrop.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bossBombDrop.cpp b/src/bossBombDrop.cpp
index c12d144..da12c34 100644
--- a/src/bossBombDrop.cpp
+++ b/src/bossBombDrop.cpp
@@ -103,14 +103,14 @@ int dDroppedBomb::onCreate() {
_324 = 20.f;
// 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();
pos.z = 3300.0;
@@ -161,10 +161,10 @@ int dDroppedBomb::onExecute() {
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))) {
this->kill();
}