fix SBZ3 plat bug

RSDKModding · Jan 24, 2021 · e890d63 · e890d63
1 parent 2ed7447
commit e890d63
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/Sonic12Decomp/Collision.cpp b/Sonic12Decomp/Collision.cpp
@@ -1015,6 +1015,8 @@ void ProcessPathGrip(Entity *player)
         sensors[6].collided = false;
         sensors[4].XPos += cosValue256;
         sensors[4].YPos += sinValue256;
+        int tileDistance = -1;
+
         switch (player->collisionMode) {
             case CMODE_FLOOR: {
                 sensors[3].XPos += cosValue256;
@@ -1051,7 +1053,7 @@ void ProcessPathGrip(Entity *player)
                     FindFloorPosition(player, &sensors[i], sensors[i].YPos >> 16);
                 }
 
-                int tileDistance = -1;
+                tileDistance = -1;
                 for (int i = 0; i < 3; i++) {
                     if (tileDistance > -1) {
                         if (sensors[i].collided) {
@@ -1108,7 +1110,7 @@ void ProcessPathGrip(Entity *player)
                     FindLWallPosition(player, &sensors[i], sensors[i].XPos >> 16);
                 }
 
-                int tileDistance = -1;
+                tileDistance = -1;
                 for (int i = 0; i < 3; i++) {
                     if (tileDistance > -1) {
                         if (sensors[i].XPos < sensors[tileDistance].XPos && sensors[i].collided) {
@@ -1161,7 +1163,7 @@ void ProcessPathGrip(Entity *player)
                     FindRoofPosition(player, &sensors[i], sensors[i].YPos >> 16);
                 }
 
-                int tileDistance = -1;
+                tileDistance = -1;
                 for (int i = 0; i < 3; i++) {
                     if (tileDistance > -1) {
                         if (sensors[i].YPos > sensors[tileDistance].YPos && sensors[i].collided) {
@@ -1215,7 +1217,7 @@ void ProcessPathGrip(Entity *player)
                     FindRWallPosition(player, &sensors[i], sensors[i].XPos >> 16);
                 }
 
-                int tileDistance = -1;
+                tileDistance = -1;
                 for (int i = 0; i < 3; i++) {
                     if (tileDistance > -1) {
                         if (sensors[i].XPos > sensors[tileDistance].XPos && sensors[i].collided) {
@@ -1248,7 +1250,7 @@ void ProcessPathGrip(Entity *player)
                 break;
             }
         }
-        if (absSpeed > -1)
+        if (tileDistance != -1)
             player->angle = sensors[0].angle;
 
         if (!sensors[3].collided)
@@ -2190,12 +2192,12 @@ void BoxCollision(Entity *thisEntity, int thisLeft, int thisTop, int thisRight,
     int rx = otherEntity->XPos >> 16 << 16;
     int ry = otherEntity->YPos >> 16 << 16;
 
-    int xDif = rx - thisRight;
+    int xDif = otherEntity->XPos - thisRight;
     if (thisEntity->XPos > otherEntity->XPos)
-        xDif = thisLeft - rx;
-    int yDif = thisTop - ry;
+        xDif = thisLeft - otherEntity->XPos;
+    int yDif = thisTop - otherEntity->YPos;
     if (thisEntity->YPos <= otherEntity->YPos)
-        yDif = ry - thisBottom;
+        yDif = otherEntity->YPos - thisBottom;
 
     if (xDif <= yDif && abs(otherEntity->XVelocity) >> 1 <= abs(otherEntity->YVelocity)) {
         sensors[0].collided = false;