summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/bossMegaGoomba.cpp20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp
index 36f521c..9817a02 100644
--- a/src/bossMegaGoomba.cpp
+++ b/src/bossMegaGoomba.cpp
@@ -93,7 +93,7 @@ class daMegaGoomba_c : public dEn_c {
};
extern "C" void *PlaySound(dStageActor_c *, int soundID);
-//extern void * HandleXSpeed(daMegaGoomba_c*);
+extern void * HandleXSpeed(daMegaGoomba_c*);
//extern void * HandleYSpeed(daMegaGoomba_c*);
daMegaGoomba_c *daMegaGoomba_c::build() {
@@ -405,8 +405,8 @@ void daMegaGoomba_c::executeState_Launch() {
this->rot.y = sin(this->timer * 3.14 / 5) * 4000;
dStageActor_c *spawner = NULL;
- // 120ticks / 80numbers * 4cases = 6avg kuribo
- int randChoice = GenerateRandomNumber(80);
+ // 120ticks / 120numbers * 3cases = 3avg kuribo
+ int randChoice = GenerateRandomNumber(120);
int randChoiceX = GenerateRandomNumber(12);
int randChoiceY = GenerateRandomNumber(7);
switch(randChoice) {
@@ -429,12 +429,6 @@ void daMegaGoomba_c::executeState_Launch() {
spawner->speed.y = randChoiceY + 3.0;
spawner->scale = (Vec){1.0, 1.0, 1.0};
break;
- case 4:
- spawner = CreateActor(EN_MAME_KURIBO, 0, this->pos, 0, 0);
- spawner->speed.x = randChoiceX - 6.0;
- spawner->speed.y = randChoiceY + 3.0;
- spawner->scale = (Vec){1.0, 1.0, 1.0};
- break;
default:
break;
};
@@ -495,9 +489,11 @@ void daMegaGoomba_c::beginState_Walk() {
}
void daMegaGoomba_c::executeState_Walk() {
- float delta = (this->direction) ? -this->XSpeed : this->XSpeed;
- this->pos.x += delta;
-
+ //HandleAcceleration();
+ HandleXSpeed();
+ UpdateObjectPosBasedOnSpeedValues_real();
+ //DoGravityMaybe();
+
int Choice;
float TimerMax = 150.0;
if (this->timer > TimerMax) {