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

port Creature_Head

Browse Source
This commit is contained in:
Marcin Kurczewski 2024-04-16 17:20:12 +02:00
parent 1a7ddbd690
commit 647d2df6fd
No known key found for this signature in database
GPG Key ID: CC65E6FD28CAE42A
6 changed files with 27 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">35.22% (429)</tspan> · <tspan class="known">62.32% (759)</tspan> · <tspan class="todo">0.41% (5)</tspan> · <tspan class="unused">2.05% (25)</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">35.30% (430)</tspan> · <tspan class="known">62.23% (758)</tspan> · <tspan class="todo">0.41% (5)</tspan> · <tspan class="unused">2.05% (25)</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="263.11" height="6" x="0" y="0" class="decompiled"/>
<rect width="465.50" height="6" x="263.11" y="0" class="known"/>
<rect width="263.72" height="6" x="0" y="0" class="decompiled"/>
<rect width="464.88" height="6" x="263.72" y="0" class="known"/>
<rect width="3.07" height="6" x="728.60" y="0" class="todo"/>
<rect width="15.33" height="6" x="731.67" y="0" class="unused"/>
</g>
@ -192,7 +192,7 @@
<rect width="12" height="12" x="180" y="30" class="decompiled"><title>int32_t __cdecl Creature_Animate(int16_t item_num, int16_t angle, int16_t tilt);</title></rect>
<rect width="12" height="12" x="195" y="30" class="decompiled"><title>int16_t __cdecl Creature_Turn(struct ITEM_INFO *item, int16_t maximum_turn);</title></rect>
<rect width="12" height="12" x="210" y="30" class="decompiled"><title>void __cdecl Creature_Tilt(struct ITEM_INFO *item, int16_t angle);</title></rect>
<rect width="12" height="12" x="225" y="30" class="known"><title>void __cdecl Creature_Head(struct ITEM_INFO *item, int16_t required);</title></rect>
<rect width="12" height="12" x="225" y="30" class="decompiled"><title>void __cdecl Creature_Head(struct ITEM_INFO *item, int16_t required);</title></rect>
<rect width="12" height="12" x="240" y="30" class="known"><title>void __cdecl Creature_Neck(struct ITEM_INFO *item, int16_t required);</title></rect>
<rect width="12" height="12" x="255" y="30" class="known"><title>void __cdecl Creature_Float(int16_t item_num);</title></rect>
<rect width="12" height="12" x="270" y="30" class="known"><title>void __cdecl Creature_Underwater(struct ITEM_INFO *item, int32_t depth);</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">32.16%</tspan> · <tspan class="known">67.52%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.32%</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">32.18%</tspan> · <tspan class="known">67.50%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.32%</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="240.20" height="6" x="0" y="0" class="decompiled"/>
<rect width="504.36" height="6" x="240.20" y="0" class="known"/>
<rect width="240.36" height="6" x="0" y="0" class="decompiled"/>
<rect width="504.20" height="6" x="240.36" y="0" class="known"/>
<rect width="0.10" height="6" x="744.56" y="0" class="todo"/>
<rect width="2.40" height="6" x="744.60" y="0" class="unused"/>
</g>
@ -2126,7 +2126,7 @@
<rect width="4.84" height="4.83" x="632.98" y="293.09" class="known"><title>void __cdecl HWR_EnableColorKey(bool state);</title></rect>
<rect width="4.84" height="4.83" x="632.98" y="300.92" class="known"><title>void __cdecl HWR_FreeTexturePages(void);</title></rect>
<rect width="4.84" height="4.83" x="632.98" y="308.76" class="known"><title>LONG __cdecl SetRegistryStringValue(LPCTSTR lpValueName, LPCTSTR value, int32_t length);</title></rect>
<rect width="4.84" height="4.73" x="632.98" y="316.59" class="known"><title>void __cdecl Creature_Head(struct ITEM_INFO *item, int16_t required);</title></rect>
<rect width="4.84" height="4.73" x="632.98" y="316.59" class="decompiled"><title>void __cdecl Creature_Head(struct ITEM_INFO *item, int16_t required);</title></rect>
<rect width="4.84" height="4.73" x="632.98" y="324.32" class="known"><title>void __cdecl ClearLOT(struct LOT_INFO *LOT);</title></rect>
<rect width="4.84" height="4.73" x="632.98" y="332.05" class="known"><title>void __cdecl LaraBurn(void);</title></rect>
<rect width="4.84" height="4.73" x="632.98" y="339.78" class="known"><title>BOOL __cdecl ReadFileSync(HANDLE handle, LPVOID lpBuffer, DWORD nBytesToRead, LPDWORD lpnBytesRead, LPOVERLAPPED lpOverlapped);</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

@ -1755,7 +1755,7 @@ typedef enum GAME_OBJECT_ID {
0040F520 000008CC + int32_t __cdecl Creature_Animate(int16_t item_num, int16_t angle, int16_t tilt);
0040FDF0 000000D5 + int16_t __cdecl Creature_Turn(struct ITEM_INFO *item, int16_t maximum_turn);
0040FED0 00000035 + void __cdecl Creature_Tilt(struct ITEM_INFO *item, int16_t angle);
0040FF10 00000049 - void __cdecl Creature_Head(struct ITEM_INFO *item, int16_t required);
0040FF10 00000049 + void __cdecl Creature_Head(struct ITEM_INFO *item, int16_t required);
0040FF60 0000004E - void __cdecl Creature_Neck(struct ITEM_INFO *item, int16_t required);
0040FFB0 000000A8 - void __cdecl Creature_Float(int16_t item_num);
00410060 00000050 - void __cdecl Creature_Underwater(struct ITEM_INFO *item, int32_t depth);

16
src/game/creature.c
View File

@ -15,6 +15,8 @@
#define ATTACK_RANGE SQUARE(WALL_L * 3) // = 9437184
#define MAX_X_ROT (20 * PHD_DEGREE) // = 3640
#define MAX_TILT (3 * PHD_DEGREE) // = 546
#define MAX_HEAD_CHANGE (5 * PHD_DEGREE) // = 910
#define HEAD_ARC 0x3000 // = 12288
void __cdecl Creature_Initialise(const int16_t item_num)
{
@ -621,3 +623,17 @@ void __cdecl Creature_Tilt(struct ITEM_INFO *const item, int16_t angle)
CLAMP(angle, -MAX_TILT, MAX_TILT);
item->rot.z += angle;
}
void __cdecl Creature_Head(struct ITEM_INFO *item, int16_t required)
{
struct CREATURE_INFO *const creature = item->data;
if (creature == NULL) {
return;
}
int16_t change = required - creature->head_rotation;
CLAMP(change, -MAX_HEAD_CHANGE, MAX_HEAD_CHANGE);
creature->head_rotation += change;
CLAMP(creature->head_rotation, -HEAD_ARC, HEAD_ARC);
}

1
src/game/creature.h
View File

@ -14,3 +14,4 @@ void __cdecl Creature_Die(int16_t item_num, bool explode);
int32_t __cdecl Creature_Animate(int16_t item_num, int16_t angle, int16_t tilt);
int16_t __cdecl Creature_Turn(struct ITEM_INFO *item, int16_t max_turn);
void __cdecl Creature_Tilt(struct ITEM_INFO *const item, int16_t angle);
void __cdecl Creature_Head(struct ITEM_INFO *item, int16_t required);

1
src/global/funcs.h
View File

@ -18,7 +18,6 @@
#define Boat_Animation ((void __cdecl (*)(struct ITEM_INFO *boat, int32_t collide))0x0040D950)
#define Boat_Control ((void __cdecl (*)(int16_t item_num))0x0040DAC0)
#define Gondola_Control ((void __cdecl (*)(int16_t item_num))0x0040E0F0)
#define Creature_Head ((void __cdecl (*)(struct ITEM_INFO *item, int16_t required))0x0040FF10)
#define Creature_Neck ((void __cdecl (*)(struct ITEM_INFO *item, int16_t required))0x0040FF60)
#define Creature_Float ((void __cdecl (*)(int16_t item_num))0x0040FFB0)
#define Creature_Underwater ((void __cdecl (*)(struct ITEM_INFO *item, int32_t depth))0x00410060)

1
src/inject_exec.c
View File

@ -524,6 +524,7 @@ static void Inject_Creature(void)
INJECT(1, 0x0040F520, Creature_Animate);
INJECT(1, 0x0040FDF0, Creature_Turn);
INJECT(1, 0x0040FED0, Creature_Tilt);
INJECT(1, 0x0040FF10, Creature_Head);
}
static void Inject_Box(void)