Skip to content

Reset movie position on restart #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
frknkrc44 wants to merge 1 commit into from
Closed

Reset movie position on restart #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions source-code/source/plugins/TLAC/Components/Pause.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@ namespace TLAC::Components
uint8_t* Pause::framespeedPatchAddress = (uint8_t*)0x140192D50;
float_t* Pause::deltaFrameHistoryAddress = (float_t*)0x140EDA6C0;
int32_t* Pause::deltaFrameHistoryIntAddress = (int32_t*)0x140EDA6C4;
uint64_t* Pause::mediaSessionAddress;
std::vector<uint8_t> Pause::origAgeageHairOp;
uint8_t* Pause::ageageHairPatchAddress = (uint8_t*)0x14054352c;
std::vector<bool> Pause::streamPlayStates;
bool(*divaGiveUpFunc)(void*) = (bool(*)(void* cls))GIVEUP_FUNC_ADDRESS;
void(__cdecl* moviePlayLibLogging)(void*, char*, void*) = (void(__cdecl*)(void*, char*, void*))0x1404241F0;
PlayerData* Pause::playerData;
InputState* Pause::inputState;
TouchSliderState* Pause::sliderState;
Expand Down Expand Up @@ -113,6 +115,11 @@ namespace TLAC::Components
DetourUpdateThread(GetCurrentThread());
DetourAttach(&(PVOID&)divaGiveUpFunc, hookedGiveUpFunc);
DetourTransactionCommit();

DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread());
DetourAttach(&(PVOID&)moviePlayLibLogging, hookedMoviePlayLibLogging);
DetourTransactionCommit();
}

void Pause::Update()
Expand Down Expand Up @@ -603,10 +610,36 @@ namespace TLAC::Components
return *(GameState*)CURRENT_GAME_STATE_ADDRESS == GS_GAME && *(SubGameState*)CURRENT_GAME_SUB_STATE_ADDRESS == SUB_GAME_MAIN && *(uint8_t*)PV_STATE_ADDRESS == 1;
}

void Pause::hookedMoviePlayLibLogging(void*, char* arg2, uint64_t* item)
{
// printf("MoviePlayLib> %s(%p)\n", arg2, item);

if (strcmp("MoviePlayLib::MediaSession::MediaSession", arg2) == 0)
{
// printf("MoviePlayLib constructor detected: %p\n", item);
if (Pause::mediaSessionAddress == nullptr)
{
Pause::mediaSessionAddress = item;
// printf("Saved pointer: %p\n", Pause::mediaSessionAddress);
}
}
}

void Pause::cleanMediaSession()
{
if (Pause::mediaSessionAddress != nullptr)
{
Pause::mediaSessionAddress = nullptr;
// printf("Removed pointer: %p\n", Pause::mediaSessionAddress);
}
}

bool Pause::hookedGiveUpFunc(void* cls)
{
if (giveUp)
{
cleanMediaSession();

giveUp = false;
pause = false;
return true;
Expand All @@ -615,6 +648,8 @@ namespace TLAC::Components
{
if (divaGiveUpFunc(cls))
{
cleanMediaSession();

pause = false;
return true;
}
Expand Down
8 changes: 8 additions & 0 deletions source-code/source/plugins/TLAC/Components/Pause.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ namespace TLAC::Components
// this is a mess of static so that menuItems can work
static bool isPauseKeyTapped();
static bool isInGame();
static void cleanMediaSession();
static std::vector<bool> streamPlayStates;
static void InjectCode(void* address, const std::vector<uint8_t> data);

Expand All @@ -51,10 +52,12 @@ namespace TLAC::Components
static int32_t origDeltaFrameHistoryInt;
static float_t* deltaFrameHistoryAddress;
static int32_t* deltaFrameHistoryIntAddress;
static uint64_t* mediaSessionAddress;

static std::vector<uint8_t> origAgeageHairOp;
static uint8_t* ageageHairPatchAddress;

static void hookedMoviePlayLibLogging(void*, char* arg2, uint64_t* item);
static bool hookedGiveUpFunc(void* cls);

static void setSEVolume(int amount);
Expand Down Expand Up @@ -142,6 +145,11 @@ namespace TLAC::Components
static void unpause() { pause = false; };
static void restart()
{
if (mediaSessionAddress != nullptr) {
void(*setPosition)(uint64_t*, uint64_t) = (void(*)(uint64_t*, uint64_t))0x140428CA0;
setPosition(mediaSessionAddress, 0);
}

/*
140d0b510+2 = 0, 140d0b510+14 = 8 for restart

Expand Down
6 changes: 3 additions & 3 deletions source-code/source/plugins/TLAC/TLAC.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -101,7 +101,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<AdditionalLibraryDirectories>..\..\..\dependencies\detours\lib;..\..\..\dependencies\freeglut\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>XINPUT9_1_0.LIB;dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>XINPUT9_1_0.LIB;dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winusb.lib;Setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>Xinput.h</IgnoreSpecificDefaultLibraries>
<AdditionalOptions>-d2:-FH4- %(AdditionalOptions)</AdditionalOptions>
</Link>
Expand Down