diff options
author | Treeki <treeki@gmail.com> | 2012-12-02 02:33:34 +0100 |
---|---|---|
committer | Treeki <treeki@gmail.com> | 2012-12-02 02:33:34 +0100 |
commit | 15af665eac26f9a29b864617d571ef539a6c42b0 (patch) | |
tree | 51505a63f6160cde691b3b9df15303d8b98fa0a1 /src/bossPlayerClown.cpp | |
parent | 25bb4867ecfde3ec489b891b182cc0fdd2711ad3 (diff) | |
download | kamek-15af665eac26f9a29b864617d571ef539a6c42b0.tar.gz kamek-15af665eac26f9a29b864617d571ef539a6c42b0.zip |
collisionMgr_c updated
Diffstat (limited to '')
-rw-r--r-- | src/bossPlayerClown.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bossPlayerClown.cpp b/src/bossPlayerClown.cpp index 6fccee6..c760214 100644 --- a/src/bossPlayerClown.cpp +++ b/src/bossPlayerClown.cpp @@ -213,12 +213,12 @@ int daClownShot::onCreate() { _324 = 0.0f; // 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(); this->speed.y = 4.0; @@ -246,7 +246,7 @@ int daClownShot::onExecute() { HandleXSpeed(); HandleYSpeed(); doSpriteMovement(); - collMgr.execute(); + collMgr.calculateBelowCollisionWithSmokeEffect(); effect.spawn("Wm_en_killersmoke", 0, &(Vec){pos.x, pos.y, pos.z}, &(S16Vec){0,0,0}, &(Vec){0.7, 0.7, 0.7}); |