mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add has_set* state for netplay settings.

Browse Source
This commit is contained in:
Themaister 2014-06-10 00:01:03 +02:00
parent 76cafc24f1
commit 159ddb86d3
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
general.h
View File

@ -390,6 +390,12 @@ struct global
bool has_set_libretro_directory; bool has_set_libretro_directory;
bool has_set_verbosity; bool has_set_verbosity;
bool has_set_netplay_mode;
bool has_set_netplay_nickname;
bool has_set_netplay_ip_address;
bool has_set_netplay_delay_frames;
bool has_set_netplay_ip_port;
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
char menu_texture_path[PATH_MAX]; char menu_texture_path[PATH_MAX];
#endif #endif

14
retroarch.c
View File

@ -903,6 +903,13 @@ static void parse_input(int argc, char *argv[])
g_extern.has_set_libretro = false; g_extern.has_set_libretro = false;
g_extern.has_set_libretro_directory = false; g_extern.has_set_libretro_directory = false;
g_extern.has_set_verbosity = false; g_extern.has_set_verbosity = false;
g_extern.has_set_netplay_mode = false;
g_extern.has_set_netplay_nickname = false;
g_extern.has_set_netplay_ip_address = false;
g_extern.has_set_netplay_delay_frames = false;
g_extern.has_set_netplay_ip_port = false;
*g_extern.subsystem = '\0'; *g_extern.subsystem = '\0';
if (argc < 2) if (argc < 2)
@ -1126,16 +1133,20 @@ static void parse_input(int argc, char *argv[])
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
case 'H': case 'H':
g_extern.has_set_netplay_ip_address = true;
g_extern.netplay_enable = true; g_extern.netplay_enable = true;
*g_extern.netplay_server = '\0';
break; break;
case 'C': case 'C':
g_extern.has_set_netplay_ip_address = true;
g_extern.netplay_enable = true; g_extern.netplay_enable = true;
strlcpy(g_extern.netplay_server, optarg, sizeof(g_extern.netplay_server)); strlcpy(g_extern.netplay_server, optarg, sizeof(g_extern.netplay_server));
break; break;
case 'F': case 'F':
g_extern.netplay_sync_frames = strtol(optarg, NULL, 0); g_extern.netplay_sync_frames = strtol(optarg, NULL, 0);
g_extern.has_set_netplay_delay_frames = true;
break; break;
#endif #endif
@ -1159,14 +1170,17 @@ static void parse_input(int argc, char *argv[])
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
case 'p': case 'p':
g_extern.has_set_netplay_ip_port = true;
g_extern.netplay_port = strtoul(optarg, NULL, 0); g_extern.netplay_port = strtoul(optarg, NULL, 0);
break; break;
case 'S': case 'S':
g_extern.has_set_netplay_mode = true;
g_extern.netplay_is_spectate = true; g_extern.netplay_is_spectate = true;
break; break;
case 'N': case 'N':
g_extern.has_set_netplay_nickname = true;
strlcpy(g_extern.netplay_nick, optarg, sizeof(g_extern.netplay_nick)); strlcpy(g_extern.netplay_nick, optarg, sizeof(g_extern.netplay_nick));
break; break;
#endif #endif

6
settings.c
View File

@ -1092,11 +1092,17 @@ bool config_load_file(const char *path, bool set_defaults)
CONFIG_GET_PATH(input.autoconfig_dir, "joypad_autoconfig_dir"); CONFIG_GET_PATH(input.autoconfig_dir, "joypad_autoconfig_dir");
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
if (!g_extern.has_set_netplay_mode)
CONFIG_GET_BOOL_EXTERN(netplay_is_spectate, "netplay_spectator_mode_enable"); CONFIG_GET_BOOL_EXTERN(netplay_is_spectate, "netplay_spectator_mode_enable");
if (!g_extern.has_set_netplay_mode)
CONFIG_GET_BOOL_EXTERN(netplay_is_client, "netplay_mode"); CONFIG_GET_BOOL_EXTERN(netplay_is_client, "netplay_mode");
if (!g_extern.has_set_netplay_nickname)
CONFIG_GET_PATH_EXTERN(netplay_nick, "netplay_nickname"); CONFIG_GET_PATH_EXTERN(netplay_nick, "netplay_nickname");
if (!g_extern.has_set_netplay_ip_address)
CONFIG_GET_PATH_EXTERN(netplay_server, "netplay_ip_address"); CONFIG_GET_PATH_EXTERN(netplay_server, "netplay_ip_address");
if (!g_extern.has_set_netplay_delay_frames)
CONFIG_GET_INT_EXTERN(netplay_sync_frames, "netplay_delay_frames"); CONFIG_GET_INT_EXTERN(netplay_sync_frames, "netplay_delay_frames");
if (!g_extern.has_set_netplay_ip_port)
CONFIG_GET_INT_EXTERN(netplay_port, "netplay_ip_port"); CONFIG_GET_INT_EXTERN(netplay_port, "netplay_ip_port");
#endif #endif