tr2/trapdoor: fix trapdoor location test

Resolves LostArtefacts#1904.
walkawayy · Nov 16, 2024 · 924713f · 924713f
1 parent 46bc253
commit 924713f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md
@@ -10,6 +10,7 @@
 - fixed Lara continuing to walk after being killed if in that animation (#1880, regression from 0.1)
 - fixed some music tracks looping while Lara remained on the same trigger tile (#1899, regression from 0.2)
 - fixed some music tracks not playing if they were the last played track and the level had no ambience (#1899, regression from 0.2)
+- fixed wrongly calculated trapdoor size that could affect custom levels (#1904)
 
 ## [0.6](https://github.com/LostArtefacts/TRX/compare/tr2-0.5...tr2-0.6) - 2024-11-06
 - added a fly cheat key (#1642)

diff --git a/src/tr2/game/objects/general/trapdoor.c b/src/tr2/game/objects/general/trapdoor.c
@@ -19,30 +19,38 @@ void Trapdoor_Setup(OBJECT *const obj)
 int32_t __cdecl Trapdoor_IsItemOnTop(
     const ITEM *const item, const int32_t x, const int32_t z)
 {
-    // trapdoor sector
-    const XZ_32 obj = {
-        .x = item->pos.x >> WALL_SHIFT,
-        .z = item->pos.z >> WALL_SHIFT,
-    };
+    const BOUNDS_16 *const orig_bounds = &Item_GetBestFrame(item)->bounds;
+    BOUNDS_16 fixed_bounds = { 0 };
 
-    // test sector
-    const XZ_32 test = {
-        .x = x >> WALL_SHIFT,
-        .z = z >> WALL_SHIFT,
-    };
-
-    switch (item->rot.y) {
-    case 0:
-        return test.x == obj.x && (test.z == obj.z || test.z == obj.z + 1);
-
-    case -PHD_180:
-        return test.x == obj.x && (test.z == obj.z || test.z == obj.z - 1);
-
-    case PHD_90:
-        return test.z == obj.z && (test.x == obj.x || test.x == obj.x + 1);
+    // Bounds need to change in order to account for 2 sector trapdoors
+    // and the trapdoor angle.
+    if (item->rot.y == 0) {
+        fixed_bounds.min_x = orig_bounds->min_x;
+        fixed_bounds.max_x = orig_bounds->max_x;
+        fixed_bounds.min_z = orig_bounds->min_z;
+        fixed_bounds.max_z = orig_bounds->max_z;
+    } else if (item->rot.y == PHD_90) {
+        fixed_bounds.min_x = orig_bounds->min_z;
+        fixed_bounds.max_x = orig_bounds->max_z;
+        fixed_bounds.min_z = -orig_bounds->max_x;
+        fixed_bounds.max_z = -orig_bounds->min_x;
+    } else if (item->rot.y == -PHD_180) {
+        fixed_bounds.min_x = -orig_bounds->max_x;
+        fixed_bounds.max_x = -orig_bounds->min_x;
+        fixed_bounds.min_z = -orig_bounds->max_z;
+        fixed_bounds.max_z = -orig_bounds->min_z;
+    } else if (item->rot.y == -PHD_90) {
+        fixed_bounds.min_x = -orig_bounds->max_z;
+        fixed_bounds.max_x = -orig_bounds->min_z;
+        fixed_bounds.min_z = orig_bounds->min_x;
+        fixed_bounds.max_z = orig_bounds->max_x;
+    }
 
-    case -PHD_90:
-        return test.z == obj.z && (test.x == obj.x || test.x == obj.x - 1);
+    if (x <= item->pos.x + fixed_bounds.max_x
+        && x >= item->pos.x + fixed_bounds.min_x
+        && z <= item->pos.z + fixed_bounds.max_z
+        && z >= item->pos.z + fixed_bounds.min_z) {
+        return true;
     }
 
     return false;