ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Let's try to implement the message inside intl/msg_hash_us.c instead - 

we need to get index from somewhere
This commit is contained in:
twinaphex 2017-08-16 05:45:51 +02:00
parent 442339a63e
commit 0eb78a26b3
3 changed files with 185 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
intl/msg_hash_us.c
View File

@ -25,15 +25,25 @@
#include "../configuration.h" #include "../configuration.h"
#include "../verbosity.h" #include "../verbosity.h"
int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
{
uint32_t driver_hash = 0; uint32_t driver_hash = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (msg == MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM)
{
snprintf(s, len,
"TODO/FIXME - Fill in message here."
);
return 0;
}
if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END && if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN) { msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
{
unsigned idx = msg - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN; unsigned idx = msg - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN;
switch (idx) { switch (idx)
{
case RARCH_FAST_FORWARD_KEY: case RARCH_FAST_FORWARD_KEY:
snprintf(s, len, snprintf(s, len,
"Toggles between fast-forwarding and \n" "Toggles between fast-forwarding and \n"
@ -207,7 +217,8 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) {
return 0; return 0;
} }
switch (msg) { switch (msg)
{
case MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS: case MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS:
snprintf(s, len, "Login details for your \n" snprintf(s, len, "Login details for your \n"
"Retro Achievements account. \n" "Retro Achievements account. \n"

22
menu/cbs/menu_cbs_info.c
View File

@ -70,20 +70,6 @@ static int action_info_cheevos(unsigned type, const char *label)
} }
#endif #endif
#ifdef HAVE_NETWORKING
static int action_info_room(unsigned type, const char *label)
{
unsigned new_id = type - MENU_SETTINGS_NETPLAY_ROOMS_START;
#if 1
RARCH_LOG ("Room id: %u IP: %s Port: %u\n", new_id,
netplay_room_list[new_id].address, netplay_room_list[new_id].port);
#endif
/* add description here
the relevant data is in netplay_room_list[new_id]*/
return 0;
}
#endif
int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx) const char *path, const char *label, unsigned type, size_t idx)
{ {
@ -99,14 +85,6 @@ int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
} }
#endif #endif
#ifdef HAVE_NETWORKING
if ((type >= MENU_SETTINGS_NETPLAY_ROOMS_START))
{
BIND_ACTION_INFO(cbs, action_info_room);
return 0;
}
#endif
BIND_ACTION_INFO(cbs, action_info_default); BIND_ACTION_INFO(cbs, action_info_default);
return -1; return -1;

1
menu/cbs/menu_cbs_ok.c
View File

@ -3413,6 +3413,7 @@ static int action_ok_push_scan_file(const char *path,
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
struct netplay_host_list *lan_hosts; struct netplay_host_list *lan_hosts;
int lan_room_count; int lan_room_count;
void netplay_refresh_rooms_menu(file_list_t *list) void netplay_refresh_rooms_menu(file_list_t *list)
{ {
char s[4115]; char s[4115];