OG bug: Obelisk keys are positioned slightly too low

[aredfan]

Copied over from 2004:

There's a new issue with the Obelisk keys being partially buried in the drawbridges.

Edit: The sprites are also partially buried in the DOS version - which doesn't suffer from the clipping issue. It's an OG bug.

Sprite pickups

Dev snapshot

PR build

3D pickups

Dev snapshot

PR build

[rr-]

Also when tackling this, let's remember to fix the origin point for the drawbridge object (items 19,20,21, and 22).

@lahm86 While playing with the injector, I put together a utility function that you might find handy:

diff --git a/src/Types/ItemBuilder.cs b/src/Types/ItemBuilder.cs
index 300bea0..c80a9b3 100644
--- a/src/Types/ItemBuilder.cs
+++ b/src/Types/ItemBuilder.cs
@@ -34,4 +34,30 @@ public abstract class ItemBuilder : InjectionBuilder
             },
         };
     }
+
+    protected static TRItemEdit NudgePosition<T>(TREntity<T> item, short itemIndex, short x = 0, short y = 0, short z = 0) where T : Enum
+    {
+        return new()
+        {
+            Index = itemIndex,
+            Item = new()
+            {
+                Angle = item.Angle,
+                X = item.X + x,
+                Y = item.Y + y,
+                Z = item.Z + z,
+                Room = item.Room,
+            },
+        };
+    }
+
+    public static TRItemEdit NudgePosition(TR1Level level, short itemIndex, short x = 0, short y = 0, short z = 0)
+    {
+        return NudgePosition<TR1Type>(level.Entities[itemIndex], itemIndex, x, y, z);
+    }
+
+    public static TRItemEdit NudgePosition(TR2Level level, short itemIndex, short x = 0, short y = 0, short z = 0)
+    {
+        return NudgePosition<TR2Type>(level.Entities[itemIndex], itemIndex, x, y, z);
+    }
 }

[aredfan]

A new issue I noticed - the senet table which previously had some clipping with the floor, now has z-fighting instead.

PR build:

Dev snapshot:

[rr-]

Yeah that one will also need to be raised a bit.

[lahm86]

There is also a floating chair in this room. May as well include it while shifting the senet table.

[aredfan]

@lahm86 The same chair type is also present in Return to Egypt (static 151) and Temple of the Cat (static 72).

[lahm86]

Oh thanks, I always forget UB.