Game-Decompilation/TR2X
1
0
Fork 0
mirror of https://github.com/LostArtefacts/TR2X.git synced 2024-12-02 19:06:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

port Boat_CheckGeton

Browse Source
This commit is contained in:
Marcin Kurczewski 2024-07-16 09:43:02 +02:00
parent 6082f0e452
commit 61ac7e06df
No known key found for this signature in database
GPG Key ID: CC65E6FD28CAE42A
6 changed files with 74 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/progress.svg
View File

@ -69,10 +69,10 @@
</g>
<g transform="translate(0 116)">
<text x="0" y="7.50">Tomb2.exe progress according to the physical function order:</text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">44.09% (537)</tspan> · <tspan class="known">53.45% (651)</tspan> · <tspan class="todo">0% (0)</tspan> · <tspan class="unused">2.46% (30)</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">44.17% (538)</tspan> · <tspan class="known">53.37% (650)</tspan> · <tspan class="todo">0% (0)</tspan> · <tspan class="unused">2.46% (30)</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="329.34" height="6" x="0" y="0" class="decompiled"/>
<rect width="399.26" height="6" x="329.34" y="0" class="known"/>
<rect width="329.96" height="6" x="0" y="0" class="decompiled"/>
<rect width="398.65" height="6" x="329.96" y="0" class="known"/>
<rect width="18.40" height="6" x="728.60" y="0" class="unused"/>
</g>
<g transform="translate(0 31)">
@ -163,7 +163,7 @@
<rect width="12" height="12" x="510" y="15" class="decompiled"><title>void __cdecl Bird_Initialise(int16_t item_num);</title></rect>
<rect width="12" height="12" x="525" y="15" class="decompiled"><title>void __cdecl Bird_Control(int16_t item_num);</title></rect>
<rect width="12" height="12" x="540" y="15" class="decompiled"><title>void __cdecl Boat_Initialise(int16_t item_num);</title></rect>
<rect width="12" height="12" x="555" y="15" class="known"><title>int32_t __cdecl Boat_CheckGeton(int16_t item_num, COLL_INFO *coll);</title></rect>
<rect width="12" height="12" x="555" y="15" class="decompiled"><title>int32_t __cdecl Boat_CheckGeton(int16_t item_num, COLL_INFO *coll);</title></rect>
<rect width="12" height="12" x="570" y="15" class="known"><title>void __cdecl Boat_Collision(int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll);</title></rect>
<rect width="12" height="12" x="585" y="15" class="known"><title>int32_t __cdecl Boat_TestWaterHeight(ITEM_INFO *item, int32_t z_off, int32_t x_off, XYZ_32 *pos);</title></rect>
<rect width="12" height="12" x="600" y="15" class="known"><title>void __cdecl Boat_DoShift(int32_t boat_num);</title></rect>
@ -1298,10 +1298,10 @@
</g>
<g transform="translate(0 546)">
<text x="0" y="7.50">Tomb2.exe progress according to the function sizes:</text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">40.02%</tspan> · <tspan class="known">59.65%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.33%</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">40.13%</tspan> · <tspan class="known">59.54%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.33%</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="298.96" height="6" x="0" y="0" class="decompiled"/>
<rect width="445.60" height="6" x="298.96" y="0" class="known"/>
<rect width="299.77" height="6" x="0" y="0" class="decompiled"/>
<rect width="444.79" height="6" x="299.77" y="0" class="known"/>
<rect width="2.44" height="6" x="744.56" y="0" class="unused"/>
</g>
<g transform="translate(0 31)">
@ -1558,7 +1558,7 @@
<rect width="14.87" height="14.27" x="430.74" y="309.18" class="known"><title>void __cdecl Boat_DoWakeEffect(ITEM_INFO *boat);</title></rect>
<rect width="14.87" height="14.27" x="430.74" y="326.45" class="known"><title>bool __cdecl TexturePageInit(TEXPAGE_DESC *page);</title></rect>
<rect width="14.87" height="14.18" x="430.74" y="343.73" class="known"><title>void __cdecl WinstonControl(int16_t item_num);</title></rect>
<rect width="14.87" height="14.09" x="430.74" y="360.91" class="known"><title>int32_t __cdecl Boat_CheckGeton(int16_t item_num, COLL_INFO *coll);</title></rect>
<rect width="14.87" height="14.09" x="430.74" y="360.91" class="decompiled"><title>int32_t __cdecl Boat_CheckGeton(int16_t item_num, COLL_INFO *coll);</title></rect>
<rect width="15.09" height="13.84" x="448.61" y="59.39" class="decompiled"><title>void __cdecl Creature_Kill(ITEM_INFO *item, int32_t kill_anim, int32_t kill_state, int32_t lara_kill_state);</title></rect>
<rect width="15.09" height="13.84" x="466.71" y="59.39" class="decompiled"><title>int32_t __cdecl Game_Cutscene_Control(int32_t nframes);</title></rect>
<rect width="15.04" height="13.84" x="484.80" y="59.39" class="known"><title>int32_t __cdecl Misc_Move3DPosTo3DPos(PHD_3DPOS *src_pos, PHD_3DPOS *dest_pos, int32_t velocity, PHD_ANGLE ang_add);</title></rect>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 360 KiB

After

Width:  |  Height:  |  Size: 360 KiB

2
docs/progress.txt
View File

@ -2192,7 +2192,7 @@ typedef struct {
# game/boat.c
0x0040CB30 0x003C + void __cdecl Boat_Initialise(int16_t item_num);
0x0040CB70 0x0170 - int32_t __cdecl Boat_CheckGeton(int16_t item_num, COLL_INFO *coll);
0x0040CB70 0x0170 + int32_t __cdecl Boat_CheckGeton(int16_t item_num, COLL_INFO *coll);
0x0040CCE0 0x015E - void __cdecl Boat_Collision(int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll);
0x0040CE40 0x00F8 - int32_t __cdecl Boat_TestWaterHeight(ITEM_INFO *item, int32_t z_off, int32_t x_off, XYZ_32 *pos);
0x0040CF40 0x01C1 - void __cdecl Boat_DoShift(int32_t boat_num);

63
src/game/objects/vehicles/boat.c
View File

@ -1,5 +1,6 @@
#include "game/objects/vehicles/boat.h"
#include "game/math.h"
#include "global/funcs.h"
#include "global/vars.h"
@ -17,3 +18,65 @@ void __cdecl Boat_Initialise(const int16_t item_num)
ITEM_INFO *const boat = &g_Items[item_num];
boat->data = boat_data;
}
int32_t __cdecl Boat_CheckGeton(
const int16_t item_num, const COLL_INFO *const coll)
{
if (g_Lara.gun_status != LGS_ARMLESS) {
return 0;
}
ITEM_INFO *const boat = &g_Items[item_num];
const ITEM_INFO *const lara = g_LaraItem;
const int32_t dist =
((lara->pos.z - boat->pos.z) * Math_Cos(-boat->rot.y)
- (lara->pos.x - boat->pos.x) * Math_Sin(-boat->rot.y))
>> W2V_SHIFT;
if (dist > 200) {
return 0;
}
int32_t geton = 0;
const int16_t rot = boat->rot.y - lara->rot.y;
if (g_Lara.water_status == LWS_SURFACE || g_Lara.water_status == LWS_WADE) {
if ((g_Input & IN_ACTION) == 0 || lara->gravity || boat->speed) {
return 0;
}
if (rot > PHD_45 && rot < PHD_135) {
geton = 1;
} else if (rot > -PHD_135 && rot < -PHD_45) {
geton = 2;
}
} else if (g_Lara.water_status == LWS_ABOVE_WATER) {
int16_t fall_speed = lara->fall_speed;
if (fall_speed > 0) {
if (rot > -PHD_135 && rot < PHD_135 && lara->pos.y > boat->pos.y) {
geton = 3;
}
} else if (!fall_speed && rot > -PHD_135 && rot < PHD_135) {
if (lara->pos.x == boat->pos.x && lara->pos.y == boat->pos.y
&& lara->pos.z == boat->pos.z) {
geton = 4;
} else {
geton = 3;
}
}
}
if (!geton) {
return 0;
}
if (!Item_TestBoundsCollide(boat, lara, coll->radius)) {
return 0;
}
if (!TestCollision(boat, lara)) {
return 0;
}
return geton;
}

1
src/game/objects/vehicles/boat.h
View File

@ -5,3 +5,4 @@
#include <stdint.h>
void __cdecl Boat_Initialise(int16_t item_num);
int32_t __cdecl Boat_CheckGeton(int16_t item_num, const COLL_INFO *coll);

1
src/global/funcs.h
View File

@ -6,7 +6,6 @@
// clang-format off
#define Output_InsertInventoryBackground ((void __cdecl (*)(const int16_t *obj_ptr))0x00401D50)
#define Boat_CheckGeton ((int32_t __cdecl (*)(int16_t item_num, COLL_INFO *coll))0x0040CB70)
#define Boat_Collision ((void __cdecl (*)(int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll))0x0040CCE0)
#define Boat_TestWaterHeight ((int32_t __cdecl (*)(ITEM_INFO *item, int32_t z_off, int32_t x_off, XYZ_32 *pos))0x0040CE40)
#define Boat_DoShift ((void __cdecl (*)(int32_t boat_num))0x0040CF40)

1
src/inject_exec.c
View File

@ -662,6 +662,7 @@ static void Inject_Objects(const bool enable)
INJECT(enable, 0x0040C880, Bird_Initialise);
INJECT(enable, 0x0040C910, Bird_Control);
INJECT(enable, 0x0040CB30, Boat_Initialise);
INJECT(enable, 0x0040CB70, Boat_CheckGeton);
}
static void Inject_S_Audio_Sample(const bool enable)