diff options
| -rw-r--r-- | src/bossPlayerClown.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/bossPlayerClown.cpp b/src/bossPlayerClown.cpp index e828336..09c610d 100644 --- a/src/bossPlayerClown.cpp +++ b/src/bossPlayerClown.cpp @@ -8,28 +8,28 @@ #define CLOWN_MODEL(clown) ((m3d::mdl_c*)( ((u32)(clown)) + 0xFD0 )) -extern "C" void *PClownCarExecute(dEn_c *clown); -extern "C" void *PClownCarAfterCreate(dEn_c *clown, u32); -extern "C" void *PClownCarDraw(dEn_c *clown); -extern "C" void *PClownCarMove(dEn_c *clown); +extern "C" int PClownCarExecute(dEn_c *clown); +extern "C" int PClownCarAfterCreate(dEn_c *clown, u32); +extern "C" int PClownCarDraw(dEn_c *clown); +extern "C" int PClownCarMove(dEn_c *clown); -void CConDraw(dEn_c *clown) { +int CConDraw(dEn_c *clown) { // setup matrices OSReport("Drawing"); // CLOWN_MODEL(clown)->scheduleForDrawing(); - PClownCarDraw(clown); + return PClownCarDraw(clown); // run normal clown function } -void CConExecute(dEn_c *clown) { +int CConExecute(dEn_c *clown) { OSReport("Executing"); - PClownCarExecute(clown); + return PClownCarExecute(clown); // run normal execute } -void CCafterCreate(dEn_c *clown) { +int CCafterCreate(dEn_c *clown) { OSReport("Creating"); clown->scale.x *= 1.25; @@ -38,18 +38,20 @@ void CCafterCreate(dEn_c *clown) { // setup the model - PClownCarAfterCreate(clown, 1); + return PClownCarAfterCreate(clown, 1); } -void CConExecuteMove(dEn_c *clown) { +int CConExecuteMove(dEn_c *clown) { OSReport("Moving"); // run normal move - PClownCarMove(clown); + int ret = PClownCarMove(clown); // check for wiimote button presses // spawn effect and attack if there are any + + return ret; } |