Game-Decompilation/TR2X
1
0
Fork 0
mirror of https://github.com/LostArtefacts/TR2X.git synced 2024-11-26 23:50:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

port Sound_SetMasterVolume

Browse Source
This commit is contained in:
Marcin Kurczewski 2023-10-04 21:01:02 +02:00
parent d17fac1868
commit a35d5ec023
No known key found for this signature in database
GPG Key ID: CC65E6FD28CAE42A
7 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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">2.33% (28)</tspan> · <tspan class="known">95.25% (1143)</tspan> · <tspan class="todo">0.67% (8)</tspan> · <tspan class="unused">1.75% (21)</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">2.42% (29)</tspan> · <tspan class="known">95.17% (1142)</tspan> · <tspan class="todo">0.67% (8)</tspan> · <tspan class="unused">1.75% (21)</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="17.43" height="6" x="0" y="0" class="decompiled"/>
<rect width="711.52" height="6" x="17.43" y="0" class="known"/>
<rect width="18.05" height="6" x="0" y="0" class="decompiled"/>
<rect width="710.90" height="6" x="18.05" y="0" class="known"/>
<rect width="4.98" height="6" x="728.95" y="0" class="todo"/>
<rect width="13.07" height="6" x="733.93" y="0" class="unused"/>
</g>
@ -1193,7 +1193,7 @@
<rect width="12" height="12" x="195" y="330" class="known"><title>int32_t __cdecl S_Audio_Sample_OutPlayLooped(int32_t track_id, uint16_t volume, int32_t pitch, int32_t pan);</title></rect>
<rect width="12" height="12" x="210" y="330" class="known"><title>void __cdecl S_Audio_Sample_OutSetPanAndVolume(int32_t track_id, int32_t pan, uint16_t volume);</title></rect>
<rect width="12" height="12" x="225" y="330" class="known"><title>void __cdecl S_Audio_Sample_OutSetPitch(int32_t track_id, int32_t pitch);</title></rect>
<rect width="12" height="12" x="240" y="330" class="known"><title>void __cdecl Sound_SetMasterVolume(int32_t volume);</title></rect>
<rect width="12" height="12" x="240" y="330" class="decompiled"><title>void __cdecl Sound_SetMasterVolume(int32_t volume);</title></rect>
<rect width="12" height="12" x="255" y="330" class="known"><title>void __cdecl S_Audio_Sample_OutCloseTrack(int32_t track_id);</title></rect>
<rect width="12" height="12" x="270" y="330" class="known"><title>void __cdecl S_Audio_Sample_OutCloseAllTracks(void);</title></rect>
<rect width="12" height="12" x="285" y="330" class="known"><title>BOOL __cdecl S_Audio_Sample_OutIsTrackPlaying(int32_t track_id);</title></rect>
@ -1283,8 +1283,8 @@
<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">2.91%</tspan> · <tspan class="known">96.76%</tspan> · <tspan class="todo">0.02%</tspan> · <tspan class="unused">0.31%</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="21.73" height="6" x="0" y="0" class="decompiled"/>
<rect width="722.81" height="6" x="21.73" y="0" class="known"/>
<rect width="21.75" height="6" x="0" y="0" class="decompiled"/>
<rect width="722.78" height="6" x="21.75" y="0" class="known"/>
<rect width="0.13" height="6" x="744.54" y="0" class="todo"/>
<rect width="2.33" height="6" x="744.67" y="0" class="unused"/>
</g>
@ -2461,7 +2461,7 @@
<rect width="0.10" height="0.10" x="739.59" y="349.77" class="known"><title>void __cdecl SeedRandomDraw(int32_t seed);</title></rect>
<rect width="0.10" height="0.10" x="742.19" y="349.77" class="known"><title>void __cdecl SE_SoundAdapterSet(HWND hwndDlg, SOUND_ADAPTER_NODE *adapter);</title></rect>
<rect width="0.10" height="0.10" x="744.80" y="349.77" class="known"><title>void __cdecl SE_ControlsJoystickSet(HWND hwndDlg, JOYSTICK_NODE *joystick);</title></rect>
<rect width="0.10" height="0.10" x="747.40" y="349.77" class="known"><title>void __cdecl Sound_SetMasterVolume(int32_t volume);</title></rect>
<rect width="0.10" height="0.10" x="747.40" y="349.77" class="decompiled"><title>void __cdecl Sound_SetMasterVolume(int32_t volume);</title></rect>
<rect width="0.10" height="0.10" x="739.59" y="352.87" class="known"><title>void __cdecl invisibility_on(struct ITEM_INFO *item);</title></rect>
<rect width="0.10" height="0.10" x="739.59" y="355.55" class="known"><title>void __cdecl dynamic_light_on(struct ITEM_INFO *item);</title></rect>
<rect width="0.10" height="0.10" x="739.59" y="358.23" class="known"><title>void __cdecl WinVidClearMinWindowSize(void);</title></rect>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 355 KiB

After

Width:  |  Height:  |  Size: 355 KiB

2
docs/progress.txt
View File

@ -2077,7 +2077,7 @@ typedef struct CINE_FRAME {
004552D0 00000046 - int32_t __cdecl S_Audio_Sample_OutPlayLooped(int32_t track_id, uint16_t volume, int32_t pitch, int32_t pan);
00455320 00000039 - void __cdecl S_Audio_Sample_OutSetPanAndVolume(int32_t track_id, int32_t pan, uint16_t volume);
00455360 0000001C - void __cdecl S_Audio_Sample_OutSetPitch(int32_t track_id, int32_t pitch);
00455380 0000000A - void __cdecl Sound_SetMasterVolume(int32_t volume);
00455380 0000000A + void __cdecl Sound_SetMasterVolume(int32_t volume);
00455390 00000017 - void __cdecl S_Audio_Sample_OutCloseTrack(int32_t track_id);
004553B0 0000003C - void __cdecl S_Audio_Sample_OutCloseAllTracks(void);
004553C0 0000001F - BOOL __cdecl S_Audio_Sample_OutIsTrackPlaying(int32_t track_id);

1
meson.build
View File

@ -78,6 +78,7 @@ dll_sources = [
'src/game/math.c',
'src/game/matrix.c',
'src/game/shell.c',
'src/game/sound.c',
'src/inject_exec.c',
'src/inject_util.c',
'src/log.c',

8
src/game/sound.c Normal file
View File

@ -0,0 +1,8 @@
#include "game/sound.h"
#include "global/vars.h"
void __cdecl Sound_SetMasterVolume(int32_t volume)
{
g_MasterVolume = volume;
}

5
src/game/sound.h Normal file
View File

@ -0,0 +1,5 @@
#pragma once
#include "global/types.h"
void __cdecl Sound_SetMasterVolume(int32_t volume);

1
src/global/funcs.h
View File

@ -1069,7 +1069,6 @@
#define S_Audio_Sample_OutPlayLooped ((int32_t __cdecl (*)(int32_t track_id, uint16_t volume, int32_t pitch, int32_t pan))0x004552D0)
#define S_Audio_Sample_OutSetPanAndVolume ((void __cdecl (*)(int32_t track_id, int32_t pan, uint16_t volume))0x00455320)
#define S_Audio_Sample_OutSetPitch ((void __cdecl (*)(int32_t track_id, int32_t pitch))0x00455360)
#define Sound_SetMasterVolume ((void __cdecl (*)(int32_t volume))0x00455380)
#define S_Audio_Sample_OutCloseTrack ((void __cdecl (*)(int32_t track_id))0x00455390)
#define S_Audio_Sample_OutCloseAllTracks ((void __cdecl (*)(void))0x004553B0)
#define S_Audio_Sample_OutIsTrackPlaying ((BOOL __cdecl (*)(int32_t track_id))0x004553C0)

10
src/inject_exec.c
View File

@ -4,12 +4,14 @@
#include "game/math.h"
#include "game/matrix.h"
#include "game/shell.h"
#include "game/sound.h"
#include "inject_util.h"
static void Inject_Camera(void);
static void Inject_Math(void);
static void Inject_Matrix(void);
static void Inject_Shell(void);
static void Inject_Sound(void);
static void Inject_Camera(void)
{
@ -54,10 +56,16 @@ static void Inject_Shell(void)
INJECT(1, 0x0044E890, Shell_ExitSystem);
}
static void Inject_Sound(void)
{
INJECT(1, 0x00455380, Sound_SetMasterVolume);
}
void Inject_Exec(void)
{
Inject_Camera();
Inject_Matrix();
Inject_Math();
Inject_Matrix();
Inject_Shell();
Inject_Sound();
}