1
0
mirror of synced 2025-02-23 13:39:06 +01:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Aaron M 2019-11-15 11:09:03 +13:00
commit e548735dfe
6 changed files with 41 additions and 3 deletions

View File

@ -0,0 +1,32 @@
#include <StdInc.h>
#include "Utility/InitFunction.h"
#include "Functions/Global.h"
#include "MinHook.h"
#include <Utility/Hooking.Patterns.h>
#include <thread>
#ifdef _M_AMD64
#pragma optimize("", off)
#pragma comment(lib, "Ws2_32.lib")
extern LPCSTR hookPort;
static InitFunction Tekken7Func([]()
{
hookPort = ("COM3");
uintptr_t imageBase = (uintptr_t)GetModuleHandleA(0);
// Skip all errors
injector::MakeNOP(imageBase + 0x25E791, 5);
// First Check Error
injector::MakeNOP(imageBase + 0x268E00, 5);
// Windowed
if (ToBool(config["General"]["Windowed"]))
{
// TODO: DOCUMENT PATCHES
injector::WriteMemory<LONGLONG>(imageBase + 0x115E757, 0xF633C1FFC1FFC933, true);
injector::WriteMemory<DWORD>(imageBase + 0x115E757 + 0x08, 0xC6FFC6FF, true);
}
}, GameID::TER);
#endif

View File

@ -80,6 +80,8 @@ static InitFunction initFunc([]()
{
if (GameDetect::currentGame == GameID::BG4)
return;
if (GameDetect::currentGame == GameID::TER)
return;
if (GameDetect::currentGame == GameID::FNFSC)
InitD3D8WindowHook();
if (ToBool(config["General"]["Windowed"]))

View File

@ -70,7 +70,7 @@ extern linb::ini config;
static InitFunction initFunc([]()
{
if (GameDetect::currentGame == GameID::BG4 || GameDetect::currentGame == GameID::JLeague)
if (GameDetect::currentGame == GameID::BG4 || GameDetect::currentGame == GameID::JLeague || GameDetect::currentGame == GameID::TER)
return;
if (ToBool(config["General"]["Windowed"]))
{

View File

@ -241,7 +241,7 @@ extern linb::ini config;
static InitFunction initFunc([]()
{
if (GameDetect::currentGame == GameID::PokkenTournament || GameDetect::currentGame == GameID::SchoolOfRagnarok)
if (GameDetect::currentGame == GameID::PokkenTournament || GameDetect::currentGame == GameID::SchoolOfRagnarok || GameDetect::currentGame == GameID::TER)
return;
if (ToBool(config["General"]["Windowed"]))
{

View File

@ -474,6 +474,9 @@ void GameDetect::DetectCurrentGame()
case 0x80ebd207:
currentGame = GameID::Theatrhythm;
break;
case 0xdb9c3a90:
currentGame = GameID::TER;
break;
#endif
default:
#ifdef _DEBUG

View File

@ -59,5 +59,6 @@ enum class GameID
FNFSB2,
GHA,
JLeague,
Theatrhythm
Theatrhythm,
TER
};