Fix some mistakes (still wrong pipeline being used somewhere)

This commit is contained in:
FutureRave 2022-05-07 00:15:58 +01:00 committed by Diavolo
parent b0dfd16759
commit 74ed1c342a
7 changed files with 10 additions and 10 deletions

View File

@ -213,7 +213,7 @@ namespace Components
}); });
// Invocation handler // Invocation handler
Scheduler::OnGameInitialized(ConnectProtocol::Invocation, Scheduler::Pipeline::CLIENT); Scheduler::OnGameInitialized(ConnectProtocol::Invocation, Scheduler::Pipeline::MAIN);
ConnectProtocol::InstallProtocol(); ConnectProtocol::InstallProtocol();
ConnectProtocol::EvaluateProtocol(); ConnectProtocol::EvaluateProtocol();

View File

@ -622,7 +622,7 @@ namespace Components
} }
}, HOOK_CALL).install()->quick(); }, HOOK_CALL).install()->quick();
Scheduler::OnGameInitialized([] Scheduler::Loop([]
{ {
Console::LastRefresh = Game::Sys_Milliseconds(); Console::LastRefresh = Game::Sys_Milliseconds();
}, Scheduler::Pipeline::MAIN); }, Scheduler::Pipeline::MAIN);

View File

@ -371,7 +371,7 @@ namespace Components
{ {
Dedicated::Heartbeat(); Dedicated::Heartbeat();
} }
}, Scheduler::Pipeline::SERVER); }, Scheduler::Pipeline::SERVER, 2min);
Dvar::OnInit([]() Dvar::OnInit([]()
{ {

View File

@ -580,11 +580,11 @@ namespace Components
auto FFCurrentOffset = *reinterpret_cast<std::uint32_t*>(0x10AA608); auto FFCurrentOffset = *reinterpret_cast<std::uint32_t*>(0x10AA608);
float fastfileLoadProgress = (float(FFCurrentOffset) / float(FFTotalSize)) * 100.0f; float fastfileLoadProgress = (float(FFCurrentOffset) / float(FFTotalSize)) * 100.0f;
if (isinf(fastfileLoadProgress)) if (std::isinf(fastfileLoadProgress))
{ {
fastfileLoadProgress = 100.0f; fastfileLoadProgress = 100.0f;
} }
else if (isnan(fastfileLoadProgress)) else if (std::isnan(fastfileLoadProgress))
{ {
fastfileLoadProgress = 0.0f; fastfileLoadProgress = 0.0f;
} }

View File

@ -245,7 +245,7 @@ namespace Components
Logger::PipeOutput(nullptr); Logger::PipeOutput(nullptr);
Scheduler::OnGameInitialized(Logger::Frame, Scheduler::Pipeline::MAIN); Scheduler::Loop(Logger::Frame, Scheduler::Pipeline::MAIN);
Utils::Hook(0x4B0218, Logger::GameLogStub, HOOK_CALL).install()->quick(); Utils::Hook(0x4B0218, Logger::GameLogStub, HOOK_CALL).install()->quick();
Utils::Hook(Game::Com_PrintMessage, Logger::PrintMessageStub, HOOK_JUMP).install()->quick(); Utils::Hook(Game::Com_PrintMessage, Logger::PrintMessageStub, HOOK_JUMP).install()->quick();

View File

@ -69,14 +69,14 @@ namespace Components
void Scheduler::REndFrame_Hk() void Scheduler::REndFrame_Hk()
{ {
Execute(Pipeline::RENDERER);
Utils::Hook::Call<void()>(0x50AB20)(); Utils::Hook::Call<void()>(0x50AB20)();
Execute(Pipeline::RENDERER);
} }
void Scheduler::ServerFrame_Hk() void Scheduler::ServerFrame_Hk()
{ {
Execute(Pipeline::SERVER);
Utils::Hook::Call<void()>(0x471C50)(); Utils::Hook::Call<void()>(0x471C50)();
Execute(Pipeline::SERVER);
} }
void Scheduler::ClientFrame_Hk(const int localClientNum) void Scheduler::ClientFrame_Hk(const int localClientNum)
@ -87,8 +87,8 @@ namespace Components
void Scheduler::MainFrame_Hk() void Scheduler::MainFrame_Hk()
{ {
Execute(Pipeline::MAIN);
Utils::Hook::Call<void()>(0x47DCA0)(); Utils::Hook::Call<void()>(0x47DCA0)();
Execute(Pipeline::MAIN);
} }
void Scheduler::SysSetBlockSystemHotkeys_Hk(int block) void Scheduler::SysSetBlockSystemHotkeys_Hk(int block)

View File

@ -922,7 +922,7 @@ namespace Components
UIScript::AddOwnerDraw(253, ServerList::UpdateGameType); UIScript::AddOwnerDraw(253, ServerList::UpdateGameType);
// Add frame callback // Add frame callback
Scheduler::OnGameInitialized(ServerList::Frame, Scheduler::Pipeline::CLIENT); Scheduler::Loop(ServerList::Frame, Scheduler::Pipeline::CLIENT);
} }
ServerList::~ServerList() ServerList::~ServerList()