Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2024-12-25 09:54:15 +08:00
Code Issues 1 Projects Releases Wiki Activity

Lobby Connect Improvements

Browse Source 
-Removed active user list to prioritize multiplayer lobbies
-Fixed infinite loop when the user inputs letters instead of numbers
-Clear output when refreshing lobby list
This commit is contained in:
M4RCK5 2024-09-13 15:12:27 -03:00 committed by GitHub
parent cd8fcaf61f
commit 367234ae64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 112 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tools/lobby_connect/lobby_connect.cpp
View File

@ -31,9 +31,18 @@
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#else
#endif #endif
void title() {
#ifdef _WIN32
system("cls");
#else
system("clear");
#endif
std::cout << "\n----Lobby Connect----\n\n";
}
int main() { int main() {
std::string appid_str(std::to_string(LOBBY_CONNECT_APPID)); std::string appid_str(std::to_string(LOBBY_CONNECT_APPID));
set_env_variable("SteamAppId", appid_str); set_env_variable("SteamAppId", appid_str);
@ -45,27 +54,19 @@ int main() {
//Set appid to: LOBBY_CONNECT_APPID //Set appid to: LOBBY_CONNECT_APPID
SteamAPI_RestartAppIfNecessary(LOBBY_CONNECT_APPID); SteamAPI_RestartAppIfNecessary(LOBBY_CONNECT_APPID);
std::cout << "This is a program to find lobbies and run the game with lobby connect parameters" << std::endl;
std::cout << "Api initialized, "; refresh:
top: title();
std::cout << "waiting a few seconds for connections:" << std::endl; std::cout << "Please wait...\n";
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
SteamAPI_RunCallbacks(); SteamAPI_RunCallbacks();
std::this_thread::sleep_for(std::chrono::milliseconds(200)); std::this_thread::sleep_for(std::chrono::milliseconds(200));
} }
int friend_count = SteamFriends()->GetFriendCount(k_EFriendFlagAll); int friend_count = SteamFriends()->GetFriendCount(k_EFriendFlagAll);
std::cout << "People on the network: " << friend_count << std::endl;
for (int i = 0; i < friend_count; ++i) {
CSteamID id = SteamFriends()->GetFriendByIndex(i, k_EFriendFlagAll);
const char *name = SteamFriends()->GetFriendPersonaName(id);
FriendGameInfo_t friend_info = {}; title();
SteamFriends()->GetFriendGamePlayed(id, &friend_info);
std::cout << name << " is playing: " << friend_info.m_gameID.AppID() << std::endl;
}
std::cout << std::endl << "--------------Menu-------------" << std::endl << "\tappid\tname\tcommand line" << std::endl;
std::vector<std::pair<std::string, uint32>> arguments; std::vector<std::pair<std::string, uint32>> arguments;
for (int i = 0; i < friend_count; ++i) { for (int i = 0; i < friend_count; ++i) {
@ -77,28 +78,35 @@ top:
auto appid = friend_info.m_gameID.AppID(); auto appid = friend_info.m_gameID.AppID();
if (strlen(connect) > 0) { if (strlen(connect) > 0) {
std::cout << arguments.size() << "\t" << appid << "\t" << name << "\t" << connect << std::endl; std::cout << arguments.size() << " - " << name << " is playing " << appid << " (" << connect << ").\n";
arguments.emplace_back(connect, appid); arguments.emplace_back(connect, appid);
} else { } else {
if (friend_info.m_steamIDLobby != k_steamIDNil) { if (friend_info.m_steamIDLobby != k_steamIDNil) {
std::string connect = "+connect_lobby " + std::to_string(friend_info.m_steamIDLobby.ConvertToUint64()); std::string connect = "+connect_lobby " + std::to_string(friend_info.m_steamIDLobby.ConvertToUint64());
std::cout << arguments.size() << "\t" << appid << "\t" << name << "\t" << connect << std::endl; std::cout << arguments.size() << " - " << name << " is playing " << appid << " (" << connect << ").\n";
arguments.emplace_back(connect, appid); arguments.emplace_back(connect, appid);
} }
} }
} }
std::cout << arguments.size() << ": Retry." << std::endl; std::cout << arguments.size() << " - Refresh.\n\n";
std::cout << std::endl << "Enter the number corresponding to your choice then press Enter." << std::endl; std::cout << "Choose an option: ";
unsigned int choice; unsigned int choice;
std::cin >> choice; std::cin >> choice;
if (choice >= arguments.size()) goto top; if (std::cin.fail() || choice >= arguments.size()) {
std::cin.clear();
std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
goto refresh;
}
title();
auto connect = arguments[choice].first; auto connect = arguments[choice].first;
#ifdef _WIN32 #ifdef _WIN32
auto appid = arguments[choice].second; auto appid = arguments[choice].second;
std::cout << "starting the game with: " << connect << std::endl; std::cout << "Starting the game with: " << connect << "\n";
char szBaseDirectory[MAX_PATH] = ""; char szBaseDirectory[MAX_PATH] = "";
GetModuleFileNameA(0, szBaseDirectory, MAX_PATH); GetModuleFileNameA(0, szBaseDirectory, MAX_PATH);
@ -117,7 +125,7 @@ top:
auto writeLobbyFile = [&lobbyFile](const std::string& data) { auto writeLobbyFile = [&lobbyFile](const std::string& data) {
std::ofstream ofs(std::filesystem::u8path(lobbyFile)); std::ofstream ofs(std::filesystem::u8path(lobbyFile));
ofs << data << std::endl; ofs << data << "\n";
}; };
auto fileExists = [](const std::string& filename) { auto fileExists = [](const std::string& filename) {
@ -150,7 +158,7 @@ top:
std::string filename = readLobbyFile(); std::string filename = readLobbyFile();
if (filename.empty() || !fileExists(filename) || !joinLobby(filename)) { if (filename.empty() || !fileExists(filename) || !joinLobby(filename)) {
std::cout << "Please select the game exe" << std::endl; std::cout << "Please select the game executable.\n";
OPENFILENAMEA ofn; OPENFILENAMEA ofn;
char szFileName[MAX_PATH] = ""; char szFileName[MAX_PATH] = "";
@ -167,8 +175,10 @@ top:
} }
} }
#else #else
std::cout << "Please launch the game with these arguments: " << connect << std::endl; std::cout << "Please launch the game with these arguments: " << connect << "\n\n";
#endif #endif
return 0; return 0;
} }