Skip to content

use if instead of goto #153

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
wants to merge 1 commit into from
Closed

use if instead of goto #153

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
82 changes: 37 additions & 45 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,53 +33,45 @@ namespace YimMenu
SavedLocations::FetchSavedLocations();
Settings::Initialize(FileMgr::GetProjectFile("./settings.json"));

if (!ModuleMgr.LoadModules())
goto EARLY_UNLOAD;

if (!Pointers.Init())
goto EARLY_UNLOAD;

if (!Renderer::Init())
goto EARLY_UNLOAD;

Players::Init();

Hooking::Init();

ScriptMgr::Init();
LOG(INFO) << "ScriptMgr initialized";

GUI::Init();

ScriptMgr::AddScript(std::make_unique<Script>(&NativeHooks::RunScript)); // runs once
ScriptMgr::AddScript(std::make_unique<Script>(&Tunables::RunScript)); // runs once
ScriptMgr::AddScript(std::make_unique<Script>(&AnticheatBypass::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&Self::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&GUI::RunScript));
FiberPool::Init(16);
ScriptMgr::AddScript(std::make_unique<Script>(&HotkeySystem::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&Commands::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&GiveVehicleReward::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&SavedPlayers::RunScript));

if (!Pointers.LateInit())
LOG(WARNING) << "Socialclub patterns failed to load";

Notifications::Show("YimMenuV2", "Loaded succesfully", NotificationType::Success);

while (g_Running)
{
Settings::Tick();
std::this_thread::yield();
if (ModuleMgr.LoadModules() && Pointers.Init() && Renderer::Init()) {
Players::Init();

Hooking::Init();

ScriptMgr::Init();
LOG(INFO) << "ScriptMgr initialized";

GUI::Init();

ScriptMgr::AddScript(std::make_unique<Script>(&NativeHooks::RunScript)); // runs once
ScriptMgr::AddScript(std::make_unique<Script>(&Tunables::RunScript)); // runs once
ScriptMgr::AddScript(std::make_unique<Script>(&AnticheatBypass::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&Self::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&GUI::RunScript));
FiberPool::Init(16);
ScriptMgr::AddScript(std::make_unique<Script>(&HotkeySystem::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&Commands::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&GiveVehicleReward::RunScript));
ScriptMgr::AddScript(std::make_unique<Script>(&SavedPlayers::RunScript));

if (!Pointers.LateInit())
LOG(WARNING) << "Socialclub patterns failed to load";

Notifications::Show("YimMenuV2", "Loaded succesfully", NotificationType::Success);

while (g_Running)
{
Settings::Tick();
std::this_thread::yield();
}

LOG(INFO) << "Unloading";
NativeHooks::Destroy();
FiberPool::Destroy();
ScriptMgr::Destroy();
Hooking::Destroy();
}

LOG(INFO) << "Unloading";
NativeHooks::Destroy();
FiberPool::Destroy();
ScriptMgr::Destroy();
Hooking::Destroy();

EARLY_UNLOAD:
g_Running = false;
Renderer::Destroy();
LogHelper::Destroy();
Expand Down