summaryrefslogtreecommitdiff
path: root/src/shyguy.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-03-02 17:12:34 -0600
committerColin Noga <Tempus@chronometry.ca>2012-03-02 17:12:34 -0600
commit5dece655469940b4752cb0dc81328c8171e2b5e7 (patch)
treec609321eac5499816afdd63e00a8e510d7c55bbc /src/shyguy.cpp
parent10c0df080e801ec4abb2c2272a90d04d00fee4e7 (diff)
downloadkamek-5dece655469940b4752cb0dc81328c8171e2b5e7.tar.gz
kamek-5dece655469940b4752cb0dc81328c8171e2b5e7.zip
Lots of poss updates, meteors, shy guys, penguins, etc.
Diffstat (limited to '')
-rw-r--r--src/shyguy.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index 0104f96..bf54c64 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -134,6 +134,7 @@ daShyGuy *daShyGuy::build() {
// Externs and States
///////////////////////
extern "C" void *PlaySound(dStageActor_c *, int soundID);
+ extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID);
extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(daShyGuy *, Vec pos);
@@ -558,7 +559,7 @@ int daShyGuy::onCreate() {
// giantRider.init(this, -19.5f, 18.0f, 19.5f, 18.0f);
- giantRider.init(this, 0.0f, 0.0f, 24.0f, 0.0f, 28.0f, 0, 0);
+ giantRider.init(this, 0.0f, 0.0f, -24.0f, 0.0f, 28.0f, 0, 0);
// addToList(&giantRider);
giantRider.addToList();
@@ -841,12 +842,12 @@ void daShyGuy::updateModelMatrices() {
if (this->jumpCounter == 3) {
bindAnimChr_and_setUpdateRate("c18_NORMAL_STEAL_R", 1, 0.0, 1.0);
this->speed.y = 8.0;
- PlaySound(this, SE_PLY_JUMPDAI_HIGH);
+ PlaySoundAsync(this, SE_PLY_JUMPDAI_HIGH);
}
else {
bindAnimChr_and_setUpdateRate("c18_EV_WIN_1_R", 1, 0.0, 1.0);
this->speed.y = 6.0;
- PlaySound(this, SE_PLY_JUMPDAI);
+ PlaySoundAsync(this, SE_PLY_JUMPDAI);
}
OSReport("Takeoff Initiated");
@@ -1013,7 +1014,7 @@ void daShyGuy::updateModelMatrices() {
}
else if (this->timer == 132) {
- PlaySound(this, SE_EMY_CRASHER_PUNCH);
+ PlaySoundAsync(this, SE_EMY_CRASHER_PUNCH);
if (this->direction == 1) {
CreateEffect(&(Vec){this->pos.x - 18.0, this->pos.y + 16.0, this->pos.z}, &(S16Vec){0,0,0}, &(Vec){1.5, 1.5, 1.5}, 123);
@@ -1038,7 +1039,7 @@ void daShyGuy::updateModelMatrices() {
}
this->timer = 0;
- PlaySound(this, SE_EMY_BIG_PAKKUN_DAMAGE_1);
+ PlaySoundAsync(this, SE_EMY_BIG_PAKKUN_DAMAGE_1);
}
}
}
@@ -1460,7 +1461,7 @@ void daShyGuy::updateModelMatrices() {
if (this->timer > 450) {
this->kill();
- return;
+ this->Delete(1);
}
// dEn_c::dieFall_Execute();