summaryrefslogtreecommitdiff
path: root/src/shyguy.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-02-29 15:11:25 -0600
committerColin Noga <Tempus@chronometry.ca>2012-02-29 15:11:25 -0600
commit10c0df080e801ec4abb2c2272a90d04d00fee4e7 (patch)
treeeae95677128ab1c603336f096ebff561b4cf3680 /src/shyguy.cpp
parent3f22b00986d9fe2ebc0b596235b9093a96720614 (diff)
downloadkamek-10c0df080e801ec4abb2c2272a90d04d00fee4e7.tar.gz
kamek-10c0df080e801ec4abb2c2272a90d04d00fee4e7.zip
FUCK YOU LINKER
Diffstat (limited to '')
-rw-r--r--src/shyguy.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index 9955404..0104f96 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -72,7 +72,7 @@ class daShyGuy : public dEn_c {
dStageActor_c *spikeA;
dStageActor_c *spikeB;
- RideableActorCollider giantRider;
+ StandOnTopCollider giantRider;
ActivePhysics Chuckles;
ActivePhysics Knuckles;
ActivePhysics balloonPhysics;
@@ -143,7 +143,7 @@ daShyGuy *daShyGuy::build() {
extern "C" int SomeStrangeModification(dStageActor_c* actor);
extern "C" void DoStuffAndMarkDead(dStageActor_c *actor, Vec vector, float unk);
extern "C" int SmoothRotation(short* rot, u16 amt, int unk2);
- extern "C" void addToList(RideableActorCollider *self);
+ // extern "C" void addToList(StandOnTopCollider *self);
CREATE_STATE(daShyGuy, Walk);
@@ -556,8 +556,11 @@ int daShyGuy::onCreate() {
HitMeBaby.xDistToEdge = 28.0;
HitMeBaby.yDistToEdge = 24.0;
- giantRider.init(this, -19.5f, 18.0f, 19.5f, 18.0f);
- addToList(&giantRider);
+ // 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);
+ // addToList(&giantRider);
+ giantRider.addToList();
giantRider.update();
}