summaryrefslogtreecommitdiff
path: root/src/meteor.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/meteor.cpp
parent10c0df080e801ec4abb2c2272a90d04d00fee4e7 (diff)
downloadkamek-5dece655469940b4752cb0dc81328c8171e2b5e7.tar.gz
kamek-5dece655469940b4752cb0dc81328c8171e2b5e7.zip
Lots of poss updates, meteors, shy guys, penguins, etc.
Diffstat (limited to 'src/meteor.cpp')
-rwxr-xr-xsrc/meteor.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/meteor.cpp b/src/meteor.cpp
index c7d9220..7d3a9bd 100755
--- a/src/meteor.cpp
+++ b/src/meteor.cpp
@@ -31,7 +31,6 @@ dMeteor *dMeteor::build() {
// extern "C" dStageActor_c *GetSpecificPlayerActor(int num);
// extern "C" void *modifyPlayerPropertiesWithRollingObject(dStageActor_c *Player, float _52C);
-extern "C" void *spinningPhysicsCallback();
int dMeteor::onCreate() {
@@ -55,22 +54,22 @@ int dMeteor::onCreate() {
// Other settings
this->spinDir = this->settings & 0x1;
- this->spinSpeed = ((this->settings >> 16) & 0xFF) * 80;
+ this->spinSpeed = ((this->settings >> 16) & 0xFF) * 20;
// Setup Physics
- MakeItRound.baseSetup(this, &spinningPhysicsCallback, 0, 0, 1, 0);
+ MakeItRound.baseSetup(this, 0, 0, 0, 1, 0);
MakeItRound.x = 0.0;
MakeItRound.y = 0.0;
- MakeItRound.diameter = 16.0 * sca;
+ MakeItRound.diameter = 13.0 * sca;
MakeItRound.isRound = 1;
MakeItRound.update();
MakeItRound.addToList();
- this->pos.z = -3458.0;
+ this->pos.z = 3458.0;
this->onExecute();
return true;
@@ -88,8 +87,6 @@ int dMeteor::onExecute() {
MakeItRound.update();
updateModelMatrices();
- // 518 == opposite of direction
-
// for (i=0; i<4; i++) {
// dStageActor_c *player = GetSpecificPlayerActor(i);
// modifyPlayerPropertiesWithRollingObject(player, );