Changes to loads of shit, mostly bowser related

1 files changed, 27 insertions, 0 deletions

diff --git a/src/bossPlayerClown.cpp b/src/bossPlayerClown.cpp
index 522314e..6a7e2fc 100644
--- a/src/bossPlayerClown.cpp
+++ b/src/bossPlayerClown.cpp
@@ -21,6 +21,16 @@ extern "C" int PClownCarDraw(dEn_c *clown);
 extern "C" void PClownCarMove(dEn_c *clown);
 
 
+
+
+const char* PCCarcNameList [] = {
+	"koopaJr_clown_ply",
+	NULL
+};
+
+
+
+
 int CConDraw(dEn_c *clown) {
 	// setup cannon model
 	clown->matrix.translation(clown->pos.x, clown->pos.y + 8.0, clown->pos.z-100.0);
@@ -196,6 +206,22 @@ int daClownShot::onCreate() {
 	this->aPhysics.initWithStruct(this, &GreatBalls);
 	this->aPhysics.addToList();
 
+
+	// These fucking rects do something for the tile rect
+	spriteSomeRectX = 8.0f;
+	spriteSomeRectY = 8.0f;
+	_320 = 0.0f;
+	_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};
+
+	collMgr.Init(this, one, two, three);
+	collMgr.execute();
+
+
 	this->speed.y = 4.0;
 	this->y_speed_inc = -0.1875;
 	
@@ -221,6 +247,7 @@ int daClownShot::onExecute() {
 	HandleXSpeed();
 	HandleYSpeed();
 	doSpriteMovement();
+	collMgr.execute();
 
 	effect.spawn("Wm_en_killersmoke", 0, &(Vec){pos.x, pos.y, pos.z}, &(S16Vec){0,0,0}, &(Vec){0.7, 0.7, 0.7});