BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2026-04-05 07:16:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Changed BlackList to std::set

Browse Source
This commit is contained in:
Anonymous275
2022-07-25 17:17:10 +03:00
parent 8f53052356
commit b27c2060ea
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Memory/Memory.h
View File

@@ -5,12 +5,12 @@
#pragma once
#include <string>
#include <vector>
#include <set>
class Memory{
public:
static uint64_t FindPattern(const char* module, const char* Pattern[]);
static uint32_t GetBeamNGPID(const std::vector<uint32_t>& BL);
static uint32_t GetBeamNGPID(const std::set<uint32_t>& BL);
static uint64_t GetModuleBase(const char* Name);
static void Print(const std::string& msg);
static void Inject(uint32_t PID);

4
src/Launcher.cpp
View File

@@ -105,11 +105,11 @@ void Launcher::LaunchGame() {
void Launcher::WaitForGame() {
LOG(INFO) << "Searching for a game process, please start BeamNG manually in case of steam issues";
std::vector<uint32_t> BlackList;
std::set<uint32_t> BlackList;
do {
auto PID = Memory::GetBeamNGPID(BlackList);
if(PID != 0 && IPC::mem_used(PID)) {
BlackList.emplace_back(PID);
BlackList.emplace(PID);
} else {
GamePID = PID;
}

8
src/Memory/Memory.cpp
View File

@@ -11,7 +11,7 @@
#include <tlhelp32.h>
#include <psapi.h>
uint32_t Memory::GetBeamNGPID(const std::vector<uint32_t>& BL) {
uint32_t Memory::GetBeamNGPID(const std::set<uint32_t>& BL) {
SetLastError(0);
PROCESSENTRY32 pe32;
pe32.dwSize = sizeof(PROCESSENTRY32);
@@ -19,9 +19,9 @@ uint32_t Memory::GetBeamNGPID(const std::vector<uint32_t>& BL) {
if(Process32First(Snapshot, &pe32)) {
do{
if(std::string("BeamNG.drive.x64.exe") == pe32.szExeFile &&
std::find(BL.begin(), BL.end(), pe32.th32ProcessID) == BL.end() &&
std::find(BL.begin(), BL.end(), pe32.th32ParentProcessID) == BL.end()) {
if(std::string("BeamNG.drive.x64.exe") == pe32.szExeFile
&& BL.find(pe32.th32ProcessID) == BL.end()
&& BL.find(pe32.th32ParentProcessID) == BL.end()) {
break;
}
}while(Process32Next(Snapshot, &pe32));