summaryrefslogtreecommitdiff
path: root/src/bossPlayerClown.cpp
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-03-21 04:27:47 +0100
committerTreeki <treeki@gmail.com>2012-03-21 04:27:47 +0100
commitb5ce02da4d7cc5960a868fa37981b4aa5706433e (patch)
tree320236277b6c78406067716af6368c1796eb1bf4 /src/bossPlayerClown.cpp
parent4d982ad4a1539bbf6b6ef62b3692a1586f5138b0 (diff)
downloadkamek-b5ce02da4d7cc5960a868fa37981b4aa5706433e.tar.gz
kamek-b5ce02da4d7cc5960a868fa37981b4aa5706433e.zip
again
Diffstat (limited to '')
-rw-r--r--src/bossPlayerClown.cpp26
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;
}