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

port Requester_SetHeading

Browse Source
This commit is contained in:
Marcin Kurczewski 2024-09-05 13:29:32 +02:00
parent 16eef6bd08
commit 2bc5b03963
No known key found for this signature in database
GPG Key ID: CC65E6FD28CAE42A
7 changed files with 41 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">58.46% (712)</tspan> · <tspan class="known">39.08% (476)</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">58.54% (713)</tspan> · <tspan class="known">39% (475)</tspan> · <tspan class="todo">0% (0)</tspan> · <tspan class="unused">2.46% (30)</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="436.67" height="6" x="0" y="0" class="decompiled"/>
<rect width="291.93" height="6" x="436.67" y="0" class="known"/>
<rect width="437.28" height="6" x="0" y="0" class="decompiled"/>
<rect width="291.32" height="6" x="437.28" y="0" class="known"/>
<rect width="18.40" height="6" x="728.60" y="0" class="unused"/>
</g>
<g transform="translate(0 31)">
@ -443,7 +443,7 @@
<rect width="12" height="12" x="210" y="105" class="decompiled"><title>void __cdecl Requester_Item_LeftAlign(REQUEST_INFO *req, TEXTSTRING *txt);</title></rect>
<rect width="12" height="12" x="225" y="105" class="decompiled"><title>void __cdecl Requester_Item_RightAlign(REQUEST_INFO *req, TEXTSTRING *txt);</title></rect>
<rect width="12" height="12" x="240" y="105" class="known"><title>int32_t __cdecl Requester_Display(REQUEST_INFO *req, int32_t des, int32_t backgrounds);</title></rect>
<rect width="12" height="12" x="255" y="105" class="known"><title>void __cdecl Requester_SetHeading(REQUEST_INFO *req, char *text1, uint32_t flags1, char *text2, uint32_t flags2);</title></rect>
<rect width="12" height="12" x="255" y="105" class="decompiled"><title>void __cdecl Requester_SetHeading(REQUEST_INFO *req, char *text1, uint32_t flags1, char *text2, uint32_t flags2);</title></rect>
<rect width="12" height="12" x="270" y="105" class="known"><title>void __cdecl Requster_RemoveAllItems(REQUEST_INFO *req);</title></rect>
<rect width="12" height="12" x="285" y="105" class="known"><title>void __cdecl Requester_ChangeItem(REQUEST_INFO *req, int32_t item, const char *text1, uint32_t flags1, const char *text2, uint32_t flags2);</title></rect>
<rect width="12" height="12" x="300" y="105" class="known"><title>void __cdecl Requester_AddItem(REQUEST_INFO *req, const char *text1, uint32_t flags1, const char *text2, uint32_t flags2);</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">62.91%</tspan> · <tspan class="known">36.76%</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">62.96%</tspan> · <tspan class="known">36.71%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.33%</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="469.97" height="6" x="0" y="0" class="decompiled"/>
<rect width="274.59" height="6" x="469.97" y="0" class="known"/>
<rect width="470.34" height="6" x="0" y="0" class="decompiled"/>
<rect width="274.22" height="6" x="470.34" y="0" class="known"/>
<rect width="2.44" height="6" x="744.56" y="0" class="unused"/>
</g>
<g transform="translate(0 31)">
@ -1813,7 +1813,7 @@
<rect width="8.66" height="9.17" x="534.18" y="185.97" class="known"><title>void __cdecl S_CopyScreenToBuffer(void);</title></rect>
<rect width="8.66" height="9.10" x="534.18" y="198.14" class="decompiled"><title>void __cdecl Matrix_RotX(int16_t rx);</title></rect>
<rect width="8.66" height="9.10" x="534.18" y="210.24" class="decompiled"><title>const int16_t *__cdecl Output_InsertObjectGT3_ZBuffered(const int16_t *obj_ptr, int32_t num, SORT_TYPE sort_type);</title></rect>
<rect width="8.66" height="9.10" x="534.18" y="222.34" class="known"><title>void __cdecl Requester_SetHeading(REQUEST_INFO *req, char *text1, uint32_t flags1, char *text2, uint32_t flags2);</title></rect>
<rect width="8.66" height="9.10" x="534.18" y="222.34" class="decompiled"><title>void __cdecl Requester_SetHeading(REQUEST_INFO *req, char *text1, uint32_t flags1, char *text2, uint32_t flags2);</title></rect>
<rect width="8.66" height="9.10" x="534.18" y="234.44" class="decompiled"><title>int32_t __cdecl Lara_CheckForLetGo(ITEM_INFO *item, COLL_INFO *coll);</title></rect>
<rect width="8.66" height="9.10" x="534.18" y="246.54" class="decompiled"><title>void __cdecl Gun_FindTargetPoint(const ITEM_INFO *item, GAME_VECTOR *target);</title></rect>
<rect width="8.66" height="9.10" x="534.18" y="258.64" class="known"><title>bool __cdecl GuidStringToBinary(LPCTSTR lpString, GUID *guid);</title></rect>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 364 KiB

After

Width:  |  Height:  |  Size: 364 KiB

2
docs/progress.txt
View File

@ -3243,7 +3243,7 @@ typedef enum {
0x00425700 0x0054 + void __cdecl Requester_Item_LeftAlign(REQUEST_INFO *req, TEXTSTRING *txt);
0x00425760 0x0056 + void __cdecl Requester_Item_RightAlign(REQUEST_INFO *req, TEXTSTRING *txt);
0x004257C0 0x0866 - int32_t __cdecl Requester_Display(REQUEST_INFO *req, int32_t des, int32_t backgrounds);
0x00426030 0x00AA - void __cdecl Requester_SetHeading(REQUEST_INFO *req, char *text1, uint32_t flags1, char *text2, uint32_t flags2);
0x00426030 0x00AA + void __cdecl Requester_SetHeading(REQUEST_INFO *req, char *text1, uint32_t flags1, char *text2, uint32_t flags2);
0x004260E0 0x0013 - void __cdecl Requster_RemoveAllItems(REQUEST_INFO *req);
0x00426100 0x00C0 - void __cdecl Requester_ChangeItem(REQUEST_INFO *req, int32_t item, const char *text1, uint32_t flags1, const char *text2, uint32_t flags2);
0x004261C0 0x00AC - void __cdecl Requester_AddItem(REQUEST_INFO *req, const char *text1, uint32_t flags1, const char *text2, uint32_t flags2);

1
src/game/gameflow.c
View File

@ -8,6 +8,7 @@
#include "game/inventory/common.h"
#include "game/objects/names.h"
#include "game/overlay.h"
#include "game/requester.h"
#include "gameflow/gameflow_new.h"
#include "global/funcs.h"
#include "global/vars.h"

27
src/game/requester.c
View File

@ -101,3 +101,30 @@ void __cdecl Requester_Item_RightAlign(
text->pos.x = x + req->x_pos;
text->bgnd_off.x = -x;
}
void __cdecl Requester_SetHeading(
REQUEST_INFO *const req, const char *const text1, const uint32_t flags1,
const char *const text2, const uint32_t flags2)
{
Text_Remove(req->heading_text1);
req->heading_text1 = NULL;
Text_Remove(req->heading_text2);
req->heading_text2 = NULL;
if (text1 != NULL) {
strcpy(req->heading_string1, text1);
req->heading_flags1 = flags1 | REQ_USE;
} else {
strcpy(req->heading_string1, "u");
req->heading_flags1 = 0;
}
if (text2 != NULL) {
strcpy(req->heading_string2, text2);
req->heading_flags2 = flags2 | REQ_USE;
} else {
strcpy(req->heading_string2, "u");
req->heading_flags2 = 0;
}
}

3
src/game/requester.h
View File

@ -7,3 +7,6 @@ void __cdecl Requester_Shutdown(REQUEST_INFO *req);
void __cdecl Requester_Item_CenterAlign(REQUEST_INFO *req, TEXTSTRING *text);
void __cdecl Requester_Item_LeftAlign(REQUEST_INFO *req, TEXTSTRING *text);
void __cdecl Requester_Item_RightAlign(REQUEST_INFO *req, TEXTSTRING *text);
void __cdecl Requester_SetHeading(
REQUEST_INFO *req, const char *text1, uint32_t flags1, const char *text2,
uint32_t flags2);

1
src/global/funcs.h
View File

@ -121,7 +121,6 @@
#define Inv_Ring_MotionItemSelect ((void __cdecl (*)(RING_INFO *ring, INVENTORY_ITEM *inv_item))0x004254D0)
#define Inv_Ring_MotionItemDeselect ((void __cdecl (*)(RING_INFO *ring, INVENTORY_ITEM *inv_item))0x00425530)
#define Requester_Display ((int32_t __cdecl (*)(REQUEST_INFO *req, int32_t des, int32_t backgrounds))0x004257C0)
#define Requester_SetHeading ((void __cdecl (*)(REQUEST_INFO *req, char *text1, uint32_t flags1, char *text2, uint32_t flags2))0x00426030)
#define Requster_RemoveAllItems ((void __cdecl (*)(REQUEST_INFO *req))0x004260E0)
#define Requester_ChangeItem ((void __cdecl (*)(REQUEST_INFO *req, int32_t item, const char *text1, uint32_t flags1, const char *text2, uint32_t flags2))0x00426100)
#define Requester_AddItem ((void __cdecl (*)(REQUEST_INFO *req, const char *text1, uint32_t flags1, const char *text2, uint32_t flags2))0x004261C0)

1
src/inject_exec.c
View File

@ -364,6 +364,7 @@ static void Inject_Requester(const bool enable)
INJECT(enable, 0x004256E0, Requester_Item_CenterAlign);
INJECT(enable, 0x00425700, Requester_Item_LeftAlign);
INJECT(enable, 0x00425760, Requester_Item_RightAlign);
INJECT(enable, 0x00426030, Requester_SetHeading);
}
static void Inject_Option(const bool enable)