Game-Decompilation/TR2X
1
0
Fork 0
mirror of https://github.com/LostArtefacts/TR2X.git synced 2025-01-07 22:03:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

port Overlay_AddDisplayPickup

Browse Source
This commit is contained in:
Marcin Kurczewski 2023-11-17 12:41:12 +01:00
parent 2de6b36658
commit 257210383f
No known key found for this signature in database
GPG Key ID: CC65E6FD28CAE42A
6 changed files with 29 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">29.80% (363)</tspan> · <tspan class="known">67.73% (825)</tspan> · <tspan class="todo">0.66% (8)</tspan> · <tspan class="unused">1.81% (22)</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">29.89% (364)</tspan> · <tspan class="known">67.65% (824)</tspan> · <tspan class="todo">0.66% (8)</tspan> · <tspan class="unused">1.81% (22)</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="222.63" height="6" x="0" y="0" class="decompiled"/>
<rect width="505.97" height="6" x="222.63" y="0" class="known"/>
<rect width="223.24" height="6" x="0" y="0" class="decompiled"/>
<rect width="505.36" height="6" x="223.24" y="0" class="known"/>
<rect width="4.91" height="6" x="728.60" y="0" class="todo"/>
<rect width="13.49" height="6" x="733.51" y="0" class="unused"/>
</g>
@ -400,7 +400,7 @@
<rect width="12" height="12" x="300" y="90" class="decompiled"><title>void __cdecl Overlay_DrawAmmoInfo(void);</title></rect>
<rect width="12" height="12" x="315" y="90" class="decompiled"><title>void __cdecl Overlay_InitialisePickUpDisplay(void);</title></rect>
<rect width="12" height="12" x="330" y="90" class="decompiled"><title>void __cdecl Overlay_DrawPickups(bool pickup_state);</title></rect>
<rect width="12" height="12" x="345" y="90" class="known"><title>void __cdecl Overlay_AddDisplayPickup(int16_t obj_num);</title></rect>
<rect width="12" height="12" x="345" y="90" class="decompiled"><title>void __cdecl Overlay_AddDisplayPickup(int16_t obj_num);</title></rect>
<rect width="12" height="12" x="360" y="90" class="known"><title>void __cdecl Overlay_DisplayModeInfo(char* string);</title></rect>
<rect width="12" height="12" x="375" y="90" class="known"><title>void __cdecl Overlay_DrawModeInfo(void);</title></rect>
<rect width="12" height="12" x="390" y="90" class="known"><title>int32_t __cdecl Display_Inventory(int32_t inventory_mode);</title></rect>
@ -1299,10 +1299,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">28.18%</tspan> · <tspan class="known">71.50%</tspan> · <tspan class="todo">0.02%</tspan> · <tspan class="unused">0.31%</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">28.21%</tspan> · <tspan class="known">71.47%</tspan> · <tspan class="todo">0.02%</tspan> · <tspan class="unused">0.31%</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="210.48" height="6" x="0" y="0" class="decompiled"/>
<rect width="534.08" height="6" x="210.48" y="0" class="known"/>
<rect width="210.71" height="6" x="0" y="0" class="decompiled"/>
<rect width="533.85" height="6" x="210.71" y="0" class="known"/>
<rect width="0.13" height="6" x="744.56" y="0" class="todo"/>
<rect width="2.31" height="6" x="744.69" y="0" class="unused"/>
</g>
@ -1991,7 +1991,7 @@
<rect width="6.68" height="6.52" x="588.98" y="312.84" class="known"><title>BOOL __cdecl UT_CenterWindow(HWND hWnd);</title></rect>
<rect width="6.68" height="6.43" x="588.98" y="322.36" class="known"><title>void __cdecl UT_MemBlt(BYTE *dstBuf, DWORD dstX, DWORD dstY, DWORD width, DWORD height, DWORD dstPitch, BYTE *srcBuf, DWORD srcX, DWORD srcY, DWORD srcPitch);</title></rect>
<rect width="6.68" height="6.26" x="588.98" y="331.79" class="decompiled"><title>int32_t __cdecl Output_VisibleZClip(const struct PHD_VBUF *vtx0, const struct PHD_VBUF *vtx1, const struct PHD_VBUF *vtx2);</title></rect>
<rect width="6.68" height="6.26" x="588.98" y="341.05" class="known"><title>void __cdecl Overlay_AddDisplayPickup(int16_t obj_num);</title></rect>
<rect width="6.68" height="6.26" x="588.98" y="341.05" class="decompiled"><title>void __cdecl Overlay_AddDisplayPickup(int16_t obj_num);</title></rect>
<rect width="6.68" height="6.26" x="588.98" y="350.31" class="decompiled"><title>int16_t __cdecl Effect_Create(int16_t room_num);</title></rect>
<rect width="6.68" height="6.26" x="588.98" y="359.57" class="known"><title>void *__cdecl game_malloc(uint32_t alloc_size, uint32_t buf_index);</title></rect>
<rect width="6.68" height="6.17" x="588.98" y="368.83" class="decompiled"><title>void __cdecl Output_SetFarZ(int32_t far_z);</title></rect>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 368 KiB

After

Width:  |  Height:  |  Size: 368 KiB

2
docs/progress.txt
View File

@ -1993,7 +1993,7 @@ typedef enum GAME_OBJECT_ID {
00421CF0 00000132 + void __cdecl Overlay_DrawAmmoInfo(void);
00421E40 00000015 + void __cdecl Overlay_InitialisePickUpDisplay(void);
00421E60 000000FD + void __cdecl Overlay_DrawPickups(bool pickup_state);
00421F60 0000006C - void __cdecl Overlay_AddDisplayPickup(int16_t obj_num);
00421F60 0000006C + void __cdecl Overlay_AddDisplayPickup(int16_t obj_num);
00421FD0 0000007A * void __cdecl Overlay_DisplayModeInfo(char* string);
00422050 0000002C * void __cdecl Overlay_DrawModeInfo(void);

18
src/game/overlay.c
View File

@ -1,5 +1,6 @@
#include "game/overlay.h"
#include "game/music.h"
#include "game/output.h"
#include "game/text.h"
#include "global/const.h"
@ -245,3 +246,20 @@ void __cdecl Overlay_DrawPickups(const bool pickup_state)
x -= cell_h;
}
}
void __cdecl Overlay_AddDisplayPickup(const int16_t obj_num)
{
if (obj_num == O_SECRET_1 || obj_num == O_SECRET_2
|| obj_num == O_SECRET_3) {
Music_Play(g_GameFlow.secret_track, false);
}
for (int i = 0; i < MAX_PICKUPS; i++) {
struct PICKUP_INFO *const pickup = &g_Pickups[i];
if (pickup->timer <= 0) {
pickup->timer = 2.5 * FRAMES_PER_SECOND;
pickup->sprite = g_Objects[obj_num].mesh_idx;
return;
}
}
}

1
src/game/overlay.h
View File

@ -11,3 +11,4 @@ void __cdecl Overlay_MakeAmmoString(char *string);
void __cdecl Overlay_DrawAmmoInfo(void);
void __cdecl Overlay_InitialisePickUpDisplay(void);
void __cdecl Overlay_DrawPickups(const bool pickup_state);
void __cdecl Overlay_AddDisplayPickup(int16_t obj_num);

1
src/global/funcs.h
View File

@ -203,7 +203,6 @@
#define InitialiseHair ((void __cdecl (*)(void))0x00420EA0)
#define HairControl ((void __cdecl (*)(int32_t in_cutscene))0x00420F20)
#define DrawHair ((void __cdecl (*)(void))0x00421920)
#define Overlay_AddDisplayPickup ((void __cdecl (*)(int16_t obj_num))0x00421F60)
#define Overlay_DisplayModeInfo ((void __cdecl (*)(char* string))0x00421FD0)
#define Overlay_DrawModeInfo ((void __cdecl (*)(void))0x00422050)
#define Display_Inventory ((int32_t __cdecl (*)(int32_t inventory_mode))0x00422080)

1
src/inject_exec.c
View File

@ -243,6 +243,7 @@ static void Inject_Overlay(void)
INJECT(1, 0x00421CF0, Overlay_DrawAmmoInfo);
INJECT(1, 0x00421E40, Overlay_InitialisePickUpDisplay);
INJECT(1, 0x00421E60, Overlay_DrawPickups);
INJECT(1, 0x00421F60, Overlay_AddDisplayPickup);
}
static void Inject_Random(void)