mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Setting data) Begin adding Netplay options

Browse Source
This commit is contained in:
twinaphex 2014-07-17 21:22:31 +02:00
parent 3fa496b9b4
commit 393f44265e
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
frontend/menu/backend/menu_common_backend.c
View File

@ -464,9 +464,21 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
#ifdef HAVE_NETPLAY
case MENU_SETTINGS_NETPLAY_OPTIONS:
file_list_clear(menu->selection_buf);
file_list_push(menu->selection_buf, "Netplay Enable", MENU_SETTINGS_NETPLAY_ENABLE, 0);
file_list_push(menu->selection_buf, "Netplay Mode", MENU_SETTINGS_NETPLAY_MODE, 0);
file_list_push(menu->selection_buf, "Spectator Mode Enable", MENU_SETTINGS_NETPLAY_SPECTATOR_MODE_ENABLE, 0);
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "netplay_enable")))
{
*current_setting->value.boolean = g_extern.netplay_enable;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_NETPLAY_ENABLE, 0);
}
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "netplay_mode")))
{
*current_setting->value.boolean = g_extern.netplay_is_client;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_NETPLAY_MODE, 0);
}
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "netplay_spectator_mode_enable")))
{
*current_setting->value.boolean = g_extern.netplay_is_spectate;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_NETPLAY_SPECTATOR_MODE_ENABLE, 0);
}
file_list_push(menu->selection_buf, "Host IP Address", MENU_SETTINGS_NETPLAY_HOST_IP_ADDRESS, 0);
file_list_push(menu->selection_buf, "TCP/UDP Port", MENU_SETTINGS_NETPLAY_TCP_UDP_PORT, 0);
file_list_push(menu->selection_buf, "Delay Frames", MENU_SETTINGS_NETPLAY_DELAY_FRAMES, 0);
@ -4887,16 +4899,8 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
break;
#ifdef HAVE_NETPLAY
case MENU_SETTINGS_NETPLAY_ENABLE:
if (action == MENU_ACTION_OK || action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT)
{
g_extern.netplay_enable = !g_extern.netplay_enable;
/* TODO/FIXME - toggle netplay on/off */
}
else if (action == MENU_ACTION_START)
{
g_extern.netplay_enable = false;
/* TODO/FIXME - toggle netplay on/off */
}
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "netplay_enable")))
menu_common_setting_set_current_boolean(current_setting, action);
break;
case MENU_SETTINGS_NETPLAY_HOST_IP_ADDRESS:
if (action == MENU_ACTION_OK)
@ -4928,16 +4932,12 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
*g_extern.netplay_nick = '\0';
break;
case MENU_SETTINGS_NETPLAY_MODE:
if (action == MENU_ACTION_OK || action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT)
g_extern.netplay_is_client = !g_extern.netplay_is_client;
else if (action == MENU_ACTION_START)
g_extern.netplay_is_client = false;
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "netplay_mode")))
menu_common_setting_set_current_boolean(current_setting, action);
break;
case MENU_SETTINGS_NETPLAY_SPECTATOR_MODE_ENABLE:
if (action == MENU_ACTION_OK || action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT)
g_extern.netplay_is_spectate = !g_extern.netplay_is_spectate;
else if (action == MENU_ACTION_START)
g_extern.netplay_is_spectate = false;
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "netplay_spectator_mode_enable")))
menu_common_setting_set_current_boolean(current_setting, action);
break;
#endif
#ifdef HAVE_OSK

22
settings_data.c
View File

@ -735,6 +735,12 @@ static void general_change_handler(const void *data)
#endif
else if (!strcmp(setting->name, "video_shared_context"))
g_settings.video.shared_context = *setting->value.boolean;
else if (!strcmp(setting->name, "netplay_enable"))
g_extern.netplay_enable = *setting->value.boolean;
else if (!strcmp(setting->name, "netplay_mode"))
g_extern.netplay_is_client = *setting->value.boolean;
else if (!strcmp(setting->name, "netplay_spectator_mode_enable"))
g_extern.netplay_is_spectate = *setting->value.boolean;
}
@ -1016,9 +1022,12 @@ rarch_setting_t* setting_data_get_list(void)
END_GROUP()
#ifdef HAVE_OVERLAY
/*******************/
/* OVERLAY OPTIONS */
/*******************/
START_GROUP("Overlay Options")
START_SUB_GROUP("State")
CONFIG_BOOL(g_settings.input.overlay_enable, "input_overlay_enable", "Overlay Enable", default_overlay_enable, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_BOOL(g_settings.input.overlay_enable, "input_overlay_enable", "Overlay Enable", default_overlay_enable, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_PATH(g_settings.input.overlay, "input_overlay", "Overlay Preset", "", GROUP_NAME, SUBGROUP_NAME, general_change_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY) WITH_VALUES("cfg")
CONFIG_FLOAT(g_settings.input.overlay_opacity, "input_overlay_opacity", "Overlay Opacity", 0.7f, GROUP_NAME, SUBGROUP_NAME, general_change_handler) WITH_RANGE(0, 1)
CONFIG_FLOAT(g_settings.input.overlay_scale, "input_overlay_scale", "Overlay Scale", 1.0f, GROUP_NAME, SUBGROUP_NAME, general_change_handler) WITH_RANGE(0, 2)
@ -1026,6 +1035,17 @@ rarch_setting_t* setting_data_get_list(void)
END_GROUP()
#endif
/*******************/
/* NETPLAY OPTIONS */
/*******************/
START_GROUP("Netplay Options")
START_SUB_GROUP("State")
CONFIG_BOOL(g_extern.netplay_enable, "netplay_enable", "Netplay Enable", false, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_BOOL(g_extern.netplay_is_client, "netplay_mode", "Netplay Mode", false, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_BOOL(g_extern.netplay_is_spectate, "netplay_spectator_mode_enable", "Netplay Spectator Mode", false, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
END_SUB_GROUP()
END_GROUP()
/*********/
/* PATHS */
/*********/