SonLVL - Improving obj15 bounding box calculation

The three versions' calculations are now the same, instead of having special-case adjustments for SLZ.
sonicretro · May 13, 2015 · 689ca2d · 689ca2d
1 parent e5fa996
commit 689ca2d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/SonLVL INI Files/GHZ/SwingingPlatform.cs b/SonLVL INI Files/GHZ/SwingingPlatform.cs
@@ -63,7 +63,7 @@ public override Rectangle GetBounds(ObjectEntry obj, Point camera)
             if ((obj.SubType & 16) !=0)
                 return new Rectangle(obj.X + imgwreckingball.Offset.X - camera.X, obj.Y + imgs[2].Offset.Y - camera.Y, imgwreckingball.Image.Width, imgs[2].Image.Height + (imgs[1].Image.Height * (obj.SubType & 15)) + imgwreckingball.Image.Height - (imgwreckingball.Image.Height / 2));
             else
-                return new Rectangle(obj.X + imgs[0].Offset.X - camera.X, obj.Y + imgs[2].Offset.Y - camera.Y, imgs[0].Image.Width, imgs[2].Image.Height + (imgs[1].Image.Height * (obj.SubType & 15)) + imgs[0].Image.Height - (imgs[0].Image.Height / 2));
+                return new Rectangle(obj.X + imgs[0].Offset.X - camera.X, obj.Y + imgs[2].Offset.Y - camera.Y, imgs[0].Image.Width, imgs[2].Image.Height + (imgs[1].Image.Height * (obj.SubType & 15)) + imgs[0].Image.Height - ((imgs[0].Image.Height + imgs[0].Offset.Y) / 2));
         }
 
         public override Sprite GetSprite(ObjectEntry obj)

diff --git a/SonLVL INI Files/SBZ/SwingingSpikeball.cs b/SonLVL INI Files/SBZ/SwingingSpikeball.cs
@@ -63,7 +63,7 @@ public override Rectangle GetBounds(ObjectEntry obj, Point camera)
             if ((obj.SubType & 16) !=0)
                 return new Rectangle(obj.X + imgwreckingball.Offset.X - camera.X, obj.Y + imgs[2].Offset.Y - camera.Y, imgwreckingball.Image.Width, imgs[2].Image.Height + (imgs[1].Image.Height * (obj.SubType & 15)) + imgwreckingball.Image.Height - (imgwreckingball.Image.Height / 2));
             else
-                return new Rectangle(obj.X + imgs[0].Offset.X - camera.X, obj.Y + imgs[2].Offset.Y - camera.Y, imgs[0].Image.Width, imgs[2].Image.Height + (imgs[1].Image.Height * (obj.SubType & 15)) + imgs[0].Image.Height - (imgs[0].Image.Height / 2));
+                return new Rectangle(obj.X + imgs[0].Offset.X - camera.X, obj.Y + imgs[2].Offset.Y - camera.Y, imgs[0].Image.Width, imgs[2].Image.Height + (imgs[1].Image.Height * (obj.SubType & 15)) + imgs[0].Image.Height - ((imgs[0].Image.Height + imgs[0].Offset.Y) / 2));
         }
 
         public override Sprite GetSprite(ObjectEntry obj)

diff --git a/SonLVL INI Files/SLZ/SwingingPlatform.cs b/SonLVL INI Files/SLZ/SwingingPlatform.cs
@@ -63,7 +63,7 @@ public override Rectangle GetBounds(ObjectEntry obj, Point camera)
             if ((obj.SubType & 16) !=0)
                 return new Rectangle(obj.X + imgwreckingball.Offset.X - camera.X, obj.Y + imgs[2].Offset.Y - camera.Y, imgwreckingball.Image.Width, imgs[2].Image.Height + (imgs[1].Image.Height * (obj.SubType & 15)) + imgwreckingball.Image.Height - (imgwreckingball.Image.Height / 2));
             else
-                return new Rectangle(obj.X + imgs[0].Offset.X - camera.X, obj.Y + imgs[2].Offset.Y - camera.Y, imgs[0].Image.Width, imgs[2].Image.Height + (imgs[1].Image.Height * (obj.SubType & 15)) + imgs[0].Image.Height - (imgs[0].Image.Height / 3));
+                return new Rectangle(obj.X + imgs[0].Offset.X - camera.X, obj.Y + imgs[2].Offset.Y - camera.Y, imgs[0].Image.Width, imgs[2].Image.Height + (imgs[1].Image.Height * (obj.SubType & 15)) + imgs[0].Image.Height - ((imgs[0].Image.Height + imgs[0].Offset.Y) / 2));
         }
 
         public override Sprite GetSprite(ObjectEntry obj)