port LOS_ClipTarget

LostArtefacts · Nov 3, 2023 · 1fb9b4c · 1fb9b4c
1 parent b794016
commit 1fb9b4c
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 10 deletions.
diff --git a/docs/progress.svg b/docs/progress.svg
diff --git a/docs/progress.txt b/docs/progress.txt
@@ -1342,7 +1342,7 @@ typedef enum LARA_MESH {
 00415BE0    000000A0    +       int32_t __cdecl LOS_Check(const struct GAME_VECTOR *start, struct GAME_VECTOR *target);
 00415C80    000002EB    +       int32_t __cdecl LOS_CheckZ(const struct GAME_VECTOR *start, struct GAME_VECTOR *target);
 00415F70    000002EC    +       int32_t __cdecl LOS_CheckX(const struct GAME_VECTOR *start, struct GAME_VECTOR *target);
-00416260    000000DA    -       int32_t __cdecl LOS_ClipTarget(const struct GAME_VECTOR *start, struct GAME_VECTOR *target, const FLOOR_INFO *floor);
+00416260    000000DA    +       int32_t __cdecl LOS_ClipTarget(const struct GAME_VECTOR *start, struct GAME_VECTOR *target, const FLOOR_INFO *floor);
 00416340    000002FE    -       int32_t __cdecl LOS_ObjectOnLOS(const struct GAME_VECTOR *start, struct GAME_VECTOR *target);
 00416640    000000B3    -       void __cdecl Room_FlipMap(void);
 00416700    00000096    -       void __cdecl Room_RemoveFlipItems(struct ROOM_INFO *r);

diff --git a/src/game/los.c b/src/game/los.c
@@ -223,6 +223,35 @@ int32_t __cdecl LOS_CheckZ(
     return 1;
 }
 
+int32_t __cdecl LOS_ClipTarget(
+    const struct GAME_VECTOR *const start, struct GAME_VECTOR *const target,
+    const FLOOR_INFO *const floor)
+{
+    const int32_t dx = target->x - start->x;
+    const int32_t dy = target->y - start->y;
+    const int32_t dz = target->z - start->z;
+
+    const int32_t height =
+        Room_GetHeight(floor, target->x, target->y, target->z);
+    if (target->y > height && start->y < height) {
+        target->y = height;
+        target->x = start->x + dx * (height - start->y) / dy;
+        target->z = start->z + dz * (height - start->y) / dy;
+        return 0;
+    }
+
+    const int32_t ceiling =
+        Room_GetCeiling(floor, target->x, target->y, target->z);
+    if (target->y < ceiling && start->y > ceiling) {
+        target->y = ceiling;
+        target->x = start->x + dx * (ceiling - start->y) / dy;
+        target->z = start->z + dz * (ceiling - start->y) / dy;
+        return 0;
+    }
+
+    return 1;
+}
+
 int32_t __cdecl LOS_Check(
     const struct GAME_VECTOR *const start, struct GAME_VECTOR *const target)
 {

diff --git a/src/game/los.h b/src/game/los.h
@@ -6,5 +6,8 @@ int32_t __cdecl LOS_CheckX(
     const struct GAME_VECTOR *start, struct GAME_VECTOR *target);
 int32_t __cdecl LOS_CheckZ(
     const struct GAME_VECTOR *start, struct GAME_VECTOR *target);
+int32_t __cdecl LOS_ClipTarget(
+    const struct GAME_VECTOR *start, struct GAME_VECTOR *target,
+    const FLOOR_INFO *floor);
 int32_t __cdecl LOS_Check(
     const struct GAME_VECTOR *start, struct GAME_VECTOR *target);
diff --git a/src/global/funcs.h b/src/global/funcs.h
@@ -112,7 +112,6 @@
 #define Item_IsTriggerActive ((int32_t __cdecl (*)(struct ITEM_INFO *item))0x004158D0)
 #define Room_GetCeiling ((int32_t __cdecl (*)(const struct FLOOR_INFO *floor, int32_t x, int32_t y, int32_t z))0x00415930)
 #define Room_GetDoor ((int16_t __cdecl (*)(struct FLOOR_INFO *floor))0x00415B90)
-#define LOS_ClipTarget ((int32_t __cdecl (*)(const struct GAME_VECTOR *start, struct GAME_VECTOR *target, const FLOOR_INFO *floor))0x00416260)
 #define LOS_ObjectOnLOS ((int32_t __cdecl (*)(const struct GAME_VECTOR *start, struct GAME_VECTOR *target))0x00416340)
 #define Room_FlipMap ((void __cdecl (*)(void))0x00416640)
 #define Room_RemoveFlipItems ((void __cdecl (*)(struct ROOM_INFO *r))0x00416700)

diff --git a/src/inject_exec.c b/src/inject_exec.c
@@ -163,6 +163,7 @@ static void Inject_LOS(void)
     INJECT(1, 0x00415BE0, LOS_Check);
     INJECT(1, 0x00415C80, LOS_CheckZ);
     INJECT(1, 0x00415F70, LOS_CheckX);
+    INJECT(1, 0x00416260, LOS_ClipTarget);
 }
 
 static void Inject_Lara_Misc(void)