Merge pull request RSDKModding#258 from Mefiresu/fix-buggernaut-onewa…

…ydoor Misc accuracy bugfixes
TheAwesomeEdu · Nov 20, 2023 · c417cca · c417cca
2 parents c296945 + c4f4425
commit c417cca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/SonicMania/Objects/CPZ/OneWayDoor.c b/SonicMania/Objects/CPZ/OneWayDoor.c
@@ -119,13 +119,13 @@ void OneWayDoor_HandlePlayerInteractions(void)
  OneWayDoor->hitboxRange.left = -88;
 
  if (Player_CheckCollisionTouch(currentPlayer, self, &OneWayDoor->hitboxRange)) {
-#if MANIA_USE_PLUS
  if (isMMZ1 && currentPlayer->sidekick && !isBehind) {
+#if MANIA_USE_PLUS
  Player->cantSwap = true;
  NoSwap->counter++;
+#endif
  }
  else
-#endif
  self->state = OneWayDoor_State_MoveUp;
  }
  }

diff --git a/SonicMania/Objects/HCZ/Buggernaut.c b/SonicMania/Objects/HCZ/Buggernaut.c
@@ -298,9 +298,7 @@ void Buggernaut_State_Child(void)
  self->position.x += self->velocity.x;
  self->position.y += self->velocity.y;
 
- EntityBuggernaut *parent = self->parent;
- if (!parent || parent->classID != Buggernaut->classID) {
- self->parent = NULL;
+ if (!self->parent || self->parent->classID != Buggernaut->classID) {
  foreach_active(Buggernaut, buggernaut)
  {
  if (buggernaut->bodyAnimator.animationID == 0
@@ -322,7 +320,7 @@ void Buggernaut_State_Child(void)
  }
 
  if (self->parent) {
- if (parent->position.x >= self->position.x) {
+ if (self->parent->position.x >= self->position.x) {
  self->velocity.x += 0x2000;
 
  if (self->velocity.x > 0x20000)
@@ -339,7 +337,7 @@ void Buggernaut_State_Child(void)
  self->direction = FLIP_NONE;
  }
 
- if (parent->position.y >= self->position.y) {
+ if (self->parent->position.y >= self->position.y) {
  self->velocity.y += 0x2000;
 
  if (self->velocity.y > 0x20000)
@@ -368,7 +366,7 @@ void Buggernaut_State_Child(void)
 
  RSDK.ProcessAnimation(&self->wingAnimator);
 
- if (parent->state == Buggernaut_State_Init)
+ if (self->parent->state == Buggernaut_State_Init)
  destroyEntity(self);
 }