mirror of
https://github.com/BeamMP/BeamMP-Launcher.git
synced 2026-04-03 14:26:15 +00:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f84b56f1b | ||
|
|
6f5197217c | ||
|
|
d1d2b3414b | ||
|
|
a669557726 | ||
|
|
be1f5c04f7 | ||
|
|
1209ff88e2 | ||
|
|
c40af681bf |
@@ -21,12 +21,14 @@
|
||||
#define beammp_fs_string std::wstring
|
||||
#define beammp_fs_char wchar_t
|
||||
#define beammp_wide(str) L##str
|
||||
#define beammp_stdout std::wcout
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#else
|
||||
#define beammp_fs_string std::string
|
||||
#define beammp_fs_char char
|
||||
#define beammp_wide(str) str
|
||||
#define beammp_stdout std::cout
|
||||
#endif
|
||||
|
||||
namespace Utils {
|
||||
@@ -120,13 +122,6 @@ namespace Utils {
|
||||
if (line.empty() || line[0] == ';' || line[0] == '#')
|
||||
continue;
|
||||
|
||||
for (auto& c : line) {
|
||||
if (c == '#' || c == ';') {
|
||||
line = line.substr(0, &c - &line[0]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
auto invalidLineLog = [&]{
|
||||
debug("Invalid INI line: " + line);
|
||||
debug("Surrounding lines: \n" +
|
||||
|
||||
@@ -57,36 +57,36 @@ void addToLog(const std::wstring& Line) {
|
||||
}
|
||||
void info(const std::string& toPrint) {
|
||||
std::string Print = getDate() + "[INFO] " + toPrint + "\n";
|
||||
std::cout << Print;
|
||||
beammp_stdout << Utils::ToWString(Print);
|
||||
addToLog(Print);
|
||||
}
|
||||
void debug(const std::string& toPrint) {
|
||||
std::string Print = getDate() + "[DEBUG] " + toPrint + "\n";
|
||||
if (options.verbose) {
|
||||
std::cout << Print;
|
||||
beammp_stdout << Utils::ToWString(Print);
|
||||
}
|
||||
addToLog(Print);
|
||||
}
|
||||
void warn(const std::string& toPrint) {
|
||||
std::string Print = getDate() + "[WARN] " + toPrint + "\n";
|
||||
std::cout << Print;
|
||||
beammp_stdout << Utils::ToWString(Print);
|
||||
addToLog(Print);
|
||||
}
|
||||
void error(const std::string& toPrint) {
|
||||
std::string Print = getDate() + "[ERROR] " + toPrint + "\n";
|
||||
std::cout << Print;
|
||||
beammp_stdout << Utils::ToWString(Print);
|
||||
addToLog(Print);
|
||||
}
|
||||
void fatal(const std::string& toPrint) {
|
||||
std::string Print = getDate() + "[FATAL] " + toPrint + "\n";
|
||||
std::cout << Print;
|
||||
beammp_stdout << Utils::ToWString(Print);
|
||||
addToLog(Print);
|
||||
std::this_thread::sleep_for(std::chrono::seconds(5));
|
||||
std::exit(1);
|
||||
}
|
||||
void except(const std::string& toPrint) {
|
||||
std::string Print = getDate() + "[EXCEP] " + toPrint + "\n";
|
||||
std::cout << Print;
|
||||
beammp_stdout << Utils::ToWString(Print);
|
||||
addToLog(Print);
|
||||
}
|
||||
|
||||
|
||||
@@ -177,6 +177,10 @@ void LegitimacyCheck() {
|
||||
std::string contents((std::istreambuf_iterator(beamngIni)), std::istreambuf_iterator<char>());
|
||||
beamngIni.close();
|
||||
|
||||
if (contents.size() >= 3 && (unsigned char)contents[0] == 0xEF && (unsigned char)contents[1] == 0xBB && (unsigned char)contents[2] == 0xBF) {
|
||||
contents = contents.substr(3);
|
||||
}
|
||||
|
||||
auto ini = Utils::ParseINI(contents);
|
||||
if (ini.empty())
|
||||
lowExit(3);
|
||||
|
||||
@@ -87,7 +87,7 @@ std::string GetVer() {
|
||||
return "2.6";
|
||||
}
|
||||
std::string GetPatch() {
|
||||
return ".3";
|
||||
return ".4";
|
||||
}
|
||||
|
||||
beammp_fs_string GetEP(const beammp_fs_char* P) {
|
||||
@@ -269,6 +269,8 @@ void LinuxPatch() {
|
||||
|
||||
void InitLauncher() {
|
||||
SetConsoleTitleA(("BeamMP Launcher v" + std::string(GetVer()) + GetPatch()).c_str());
|
||||
SetConsoleOutputCP(CP_UTF8);
|
||||
_setmode(_fileno(stdout), _O_U8TEXT);
|
||||
debug("Launcher Version : " + GetVer() + GetPatch());
|
||||
CheckName();
|
||||
LinuxPatch();
|
||||
|
||||
Reference in New Issue
Block a user