mirror of
https://github.com/BeamMP/BeamMP-Launcher.git
synced 2026-04-07 00:06:08 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6b494c6c4 | ||
|
|
a80d4f5147 | ||
|
|
811b04485c | ||
|
|
a64fead653 | ||
|
|
399461d1b1 | ||
|
|
ec5e8ed5b3 | ||
|
|
5655164e60 | ||
|
|
3d9b7c2d67 | ||
|
|
764e3ab5c1 |
2
.github/workflows/cmake-windows.yml
vendored
2
.github/workflows/cmake-windows.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
vcpkgArguments: 'discord-rpc zlib rapidjson openssl'
|
vcpkgArguments: 'discord-rpc zlib rapidjson openssl'
|
||||||
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
||||||
vcpkgGitCommitId: '86ff75c6d8232b54d3ebd0e71525b4634dcd9523'
|
vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273'
|
||||||
vcpkgTriplet: 'x64-windows-static'
|
vcpkgTriplet: 'x64-windows-static'
|
||||||
|
|
||||||
- name: Create Build Environment
|
- name: Create Build Environment
|
||||||
|
|||||||
2
.github/workflows/release-build.yml
vendored
2
.github/workflows/release-build.yml
vendored
@@ -44,7 +44,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
vcpkgArguments: 'discord-rpc zlib rapidjson openssl'
|
vcpkgArguments: 'discord-rpc zlib rapidjson openssl'
|
||||||
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
||||||
vcpkgGitCommitId: '86ff75c6d8232b54d3ebd0e71525b4634dcd9523'
|
vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273'
|
||||||
vcpkgTriplet: 'x64-windows-static'
|
vcpkgTriplet: 'x64-windows-static'
|
||||||
|
|
||||||
- name: Create Build Environment
|
- name: Create Build Environment
|
||||||
|
|||||||
@@ -99,8 +99,8 @@ void ErrorAboard(){
|
|||||||
exit(6);
|
exit(6);
|
||||||
}
|
}
|
||||||
void Discord_Main(){
|
void Discord_Main(){
|
||||||
std::thread t1(DMain);
|
/*std::thread t1(DMain);
|
||||||
t1.detach();
|
t1.detach();*/
|
||||||
/*info("Connecting to discord client...");
|
/*info("Connecting to discord client...");
|
||||||
int C = 0;
|
int C = 0;
|
||||||
while(DiscordInfo == nullptr && C < 80){
|
while(DiscordInfo == nullptr && C < 80){
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ std::string Auth(SOCKET Sock){
|
|||||||
|
|
||||||
auto Res = TCPRcv(Sock);
|
auto Res = TCPRcv(Sock);
|
||||||
|
|
||||||
if(Res.empty() || Res[0] == 'E'){
|
if(Res.empty() || Res[0] == 'E' || Res[0] == 'K'){
|
||||||
Abord();
|
Abord();
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
@@ -87,7 +87,7 @@ std::string Auth(SOCKET Sock){
|
|||||||
|
|
||||||
Res = TCPRcv(Sock);
|
Res = TCPRcv(Sock);
|
||||||
|
|
||||||
if(Res[0] == 'E'){
|
if(Res[0] == 'E' || Res[0] == 'K'){
|
||||||
Abord();
|
Abord();
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ std::string TCPRcv(SOCKET Sock){
|
|||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
//debug("Parsing from server -> " + std::to_string(Ret.size()));
|
//debug("Parsing from server -> " + std::to_string(Ret.size()));
|
||||||
#endif
|
#endif
|
||||||
if(Ret[0] == 'E')UUl(Ret.substr(1));
|
if(Ret[0] == 'E' || Ret[0] == 'K')UUl(Ret.substr(1));
|
||||||
return Ret;
|
return Ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,8 +29,9 @@ std::string GetVer(){
|
|||||||
return "2.0";
|
return "2.0";
|
||||||
}
|
}
|
||||||
std::string GetPatch(){
|
std::string GetPatch(){
|
||||||
return ".79";
|
return ".82";
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string GetEP(char*P){
|
std::string GetEP(char*P){
|
||||||
static std::string Ret = [&](){
|
static std::string Ret = [&](){
|
||||||
std::string path(P);
|
std::string path(P);
|
||||||
@@ -242,14 +243,9 @@ void EnableMP(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void PreGame(const std::string& GamePath){
|
void PreGame(const std::string& GamePath){
|
||||||
const std::string CurrVer("0.26.1.0");
|
|
||||||
std::string GameVer = CheckVer(GamePath);
|
std::string GameVer = CheckVer(GamePath);
|
||||||
info("Game Version : " + GameVer);
|
info("Game Version : " + GameVer);
|
||||||
if(GameVer < CurrVer){
|
|
||||||
fatal("Game version is old! Please update.");
|
|
||||||
}else if(GameVer > CurrVer){
|
|
||||||
warn("Game is newer than recommended, multiplayer may not work as intended!");
|
|
||||||
}
|
|
||||||
CheckMP(GetGamePath() + "mods/multiplayer");
|
CheckMP(GetGamePath() + "mods/multiplayer");
|
||||||
|
|
||||||
if(!Dev) {
|
if(!Dev) {
|
||||||
|
|||||||
Reference in New Issue
Block a user