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

link UI data with launcher data

Browse Source 
fix auto update
fix crash caused by stdout
This commit is contained in:
Anonymous275
2022-08-19 14:01:35 +03:00
parent 4e8421a515
commit eeac661bd0
9 changed files with 81 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/Launcher.h
View File

@@ -18,6 +18,7 @@ struct VersionParser {
std::vector<std::string> split;
std::vector<size_t> data;
};
struct HKEY__;
typedef HKEY__ *HKEY;
@@ -31,14 +32,11 @@ class Launcher {
std::string Login(const std::string& fields);
void SendIPC(const std::string& Data, bool core = true);
void RunDiscordRPC();
void QueryRegistry();
void WaitForGame();
void LoadConfig();
void LaunchGame();
void CheckKey();
void SetupMOD();
static void AdminRelaunch();
static void Relaunch();
static std::string QueryValue(HKEY& hKey, const char* Name);
public: // Getters and Setters
@@ -54,11 +52,9 @@ class Launcher {
private: // functions
void HandleIPC(const std::string& Data);
std::string GetLocalAppdata();
void UpdatePresence();
void RichPresence();
void WindowsInit();
void UpdateCheck();
void ResetMods();
void EnableMP();
void ListenIPC();
@@ -68,7 +64,7 @@ class Launcher {
static inline std::thread EntryThread{};
static inline VersionParser SupportedVersion{"0.25.4.0"};
static inline std::string Version{"2.0"};
static inline std::string FullVersion{Version + ".1"};
static inline std::string FullVersion{Version + ".99"};
private: // variables
uint32_t GamePID{0};
@@ -87,9 +83,7 @@ class Launcher {
std::string DiscordMessage{};
Server ServerHandler{this};
std::string TargetBuild{"default"};
std::string GameConfigPath{};
std::string ProfileConfigPath{};
std::string CacheConfigPath{};
std::string LauncherCache{};
static inline std::atomic<bool> Shutdown{false}, Exit{false};
std::unique_ptr<IPC> IPCToGame{};
std::unique_ptr<IPC> IPCFromGame{};
@@ -102,10 +96,8 @@ class ShutdownException : public std::runtime_error {
};
struct UIData {
static inline std::string GamePath, ProfilePath, CachePath, Build, PublicKey, UserRole, Username;
static inline std::string GamePath, ProfilePath, CachePath, Build, PublicKey, UserRole, Username, GameVer;
static inline bool LoginAuth{false}, Console{false};
};
void UpdateKey(const std::string& newKey);

3
include/Logger.h
View File

@@ -10,4 +10,7 @@
class Log {
public:
static void Init();
static void ConsoleOutput(bool enable);
private:
static inline el::Configurations Conf{};
};