summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-07-20 17:54:31 -0500
committerColin Noga <Tempus@chronometry.ca>2012-07-20 17:54:31 -0500
commit061f0c1d9eda240eace4b638575f0fca1d1a3b1c (patch)
treeb22a2ddfc0f4ee78f1f98e77ec242454e65d9874
parent228e5b26f02321bf90981879bd9781cbd91ab6a9 (diff)
downloadkamek-061f0c1d9eda240eace4b638575f0fca1d1a3b1c.tar.gz
kamek-061f0c1d9eda240eace4b638575f0fca1d1a3b1c.zip
typo, fixed
-rw-r--r--src/bossSamurshai.cpp2
-rw-r--r--src/koopatlas/pathmanager.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp
index eecb799..88886e9 100644
--- a/src/bossSamurshai.cpp
+++ b/src/bossSamurshai.cpp
@@ -881,7 +881,7 @@ void daSamurshai::updateModelMatrices() {
SpawnEffect("Wm_ob_cmnshotstar", 0, &(Vec){pos.x + 8.0, pos.y - 8.0, pos.z + 500.0}, &(S16Vec){0,0,0}, &(Vec){1.75, 1.75, 1.75});
SpawnEffect("Wm_mr_wirehit_hit", 0, &(Vec){pos.x + 8.0, pos.y, pos.z + 500.0}, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
- PlaySound(actor, STRM_BGM_SHIRO_BOSS_CLEAR);
+ PlaySound(this, STRM_BGM_SHIRO_BOSS_CLEAR);
MakeMarioEnterDemoMode();
this->dying = 1;
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp
index f33bc7b..50c1ee2 100644
--- a/src/koopatlas/pathmanager.cpp
+++ b/src/koopatlas/pathmanager.cpp
@@ -272,6 +272,9 @@ void dWMPathManager_c::moveThroughPath() {
keysY[2] = (HermiteKey){ to->y, 0.0, 1.0 };
float modY = GetHermiteCurveValue(player->pos.y, keysY, 3);
+ OSReport("From: %f", from->y);
+ OSReport("ModY: %f", modY);
+ OSReport("Pos: %f", player->pos.y);
OSReport("From: %f to %f, midpoint at: %f, pos at %f, Y mod: %f", from->y, to->y, midpoint, player->pos.y, modY);
player->pos.x += move.x;