Updated help strings to reflect new room implementation

This commit is contained in:
OpenSauce04 2025-04-02 17:43:46 +01:00 committed by OpenSauce
parent 544c6b4bbc
commit fdbc74b506
5 changed files with 14 additions and 5 deletions

View file

@ -1,4 +1,4 @@
// Copyright Citra Emulator Project / Lime3DS Emulator Project // Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
@ -25,6 +25,10 @@ constexpr char help_string[] =
// TODO: Move -m outside of this check when it is implemented in Qt frontend // TODO: Move -m outside of this check when it is implemented in Qt frontend
"-m, --multiplayer [nick:password@address:port] Nickname, password, address and port for " "-m, --multiplayer [nick:password@address:port] Nickname, password, address and port for "
"multiplayer (currently only usable with SDL frontend)\n" "multiplayer (currently only usable with SDL frontend)\n"
#endif
#ifdef ENABLE_ROOM
" --room Utilize dedicated multiplayer room functionality (equivalent to "
"the old citra-room executable)\n"
#endif #endif
"-v, --version Output version information and exit\n" "-v, --version Output version information and exit\n"
"-w, --windowed Start in windowed mode"; "-w, --windowed Start in windowed mode";

View file

@ -31,7 +31,7 @@ int main(int argc, char* argv[]) {
} }
if (launch_room) { if (launch_room) {
LaunchRoom(argc, argv); LaunchRoom(argc, argv, true);
return 0; return 0;
} }
#endif #endif

View file

@ -161,11 +161,16 @@ static void InitializeLogging(const std::string& log_file) {
} }
/// Application entry point /// Application entry point
void LaunchRoom(int argc, char** argv) { void LaunchRoom(int argc, char** argv, bool called_by_option) {
Common::DetachedTasks detached_tasks; Common::DetachedTasks detached_tasks;
int option_index = 0; int option_index = 0;
char* endarg; char* endarg;
char* new_argv0 = argv[0];
if (called_by_option) {
strcat(new_argv0, " --room");
}
std::string room_name; std::string room_name;
std::string room_description; std::string room_description;
std::string password; std::string password;

View file

@ -4,4 +4,4 @@
#pragma once #pragma once
void LaunchRoom(int argc, char** argv); void LaunchRoom(int argc, char** argv, bool called_by_option);

View file

@ -5,5 +5,5 @@
#include "citra_room/citra_room.h" #include "citra_room/citra_room.h"
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
LaunchRoom(argc, argv); LaunchRoom(argc, argv, false);
} }