Skip to content

New dialog for user assisted game searching #3884

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

Merged
merged 1 commit into from
Dec 16, 2024
Merged

New dialog for user assisted game searching #3884

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
27 changes: 12 additions & 15 deletions Client/loader/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <Softpub.h>
#include <wintrust.h>
#include <version.h>
#include <windows.h>
#pragma comment (lib, "wintrust")

namespace fs = std::filesystem;
Expand Down Expand Up @@ -527,30 +528,26 @@ bool LookForGtaProcess(SString& strOutPathFilename)
//
//
///////////////////////////////////////////////////////////////
SString DoUserAssistedSearch()
static const SString DoUserAssistedSearch() noexcept
{
SString strResult;
SString result;

ShowProgressDialog(g_hInstance, _("Searching for Grand Theft Auto San Andreas"), true);
MessageBox(nullptr, _("Start Grand Theft Auto: San Andreas.\nEnsure the game is placed in the 'Program Files (x86)' folder."), _("Searching for GTA: San Andreas"), MB_OK | MB_ICONINFORMATION);

while (!UpdateProgress(0, 100, _("Please start Grand Theft Auto San Andreas")))
while (true)
{
SString strPathFilename;
// Check if user has started GTA
if (LookForGtaProcess(strPathFilename))
SString path;

if (LookForGtaProcess(path))
{
// If so, get the exe path
ExtractFilename(strPathFilename, &strResult, NULL);
// And then stop it
ExtractFilename(path, &result, nullptr);
TerminateGTAIfRunning();
break;
return result;
}

Sleep(200);
if (MessageBox(nullptr, _("Sorry, game not found.\nStart Grand Theft Auto: San Andreas and click retry.\nEnsure the game is placed in the 'Program Files (x86)' folder."), _("Searching for GTA: San Andreas"), MB_RETRYCANCEL | MB_ICONWARNING) == IDCANCEL)
return result;
}

HideProgressDialog();
return strResult;
}

///////////////////////////////////////////////////////////////
Expand Down
Loading