mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

New netplay failure messages.

Browse Source
This commit is contained in:
Gregor Richards 2017-09-12 17:00:30 -04:00
parent e4ad16fc1b
commit fff95facc7
14 changed files with 28 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_chs.h
View File

@ -54,10 +54,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"你已作为玩家 %d 加入"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"实现有差异。确保正在使用的RetroArch和核心是同版本的。"
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"This core does not support inter-architecture netplay between these systems"

4
intl/msg_hash_cht.h
View File

@ -54,10 +54,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"你已作為玩家 %d 加入"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"執行時錯誤發生。請確保雙方的所使用的RetroArch跟核心是同版本的。"
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"This core does not support inter-architecture netplay between these systems"

4
intl/msg_hash_de.h
View File

@ -54,10 +54,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"Du bist als Spieler %d beigetreten"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"Unterschiedliche Implementierungen. Stelle sicher, dass Du die gleiche Version von RetroArch und dem Core verwendest."
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"Dieser Core unterstützt kein Netplay zwischen diesen Systemen"

4
intl/msg_hash_fr.h
View File

@ -54,10 +54,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"Vous avez rejoint le jeu en tant que joueur %d"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"Les implémentations diffèrent. Assurez vous d'utiliser les mêmes versions de RetroArch et du cœur."
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"Ce cœur ne supporte pas le netplay inter-architectures entre ces systèmes"

4
intl/msg_hash_it.h
View File

@ -54,10 +54,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"Sei entrato come giocatore %d"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"Le implementazioni differiscono. Assicurati di utilizzare le stesse versioni di RetroArch e del core."
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"Questo core non supporta la rete di inter-architettura tra questi sistemi"

4
intl/msg_hash_ja.h
View File

@ -59,10 +59,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"「プレイヤー%d」で接続しました"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"実装が異なります。相手のRetroArchとコアのバージョンが同じに確認してください。"
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"This core does not support inter-architecture netplay between these systems"

4
intl/msg_hash_ko.h
View File

@ -54,10 +54,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"Y%d 플레이어로 입장했습니다"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"구현 방법에 차이가 있습니다. 동일한 버전의 RetroArch와 코어인지 확인하십시오."
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"현재 코어는 해당 시스템 사이에서 구조 간 넷플레이를 지원하지 않습니다"

3
intl/msg_hash_pt_br.h
View File

@ -40,9 +40,6 @@ MSG_HASH(MSG_NETPLAY_YOU_HAVE_LEFT_THE_GAME,
MSG_HASH(MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"Você se juntou como jogador %d"
)
MSG_HASH(MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"As implementações são diferentes. Certifique-se de que está usando exatamente as mesmas versões do RetroArch e do núcleo."
)
MSG_HASH(MSG_NETPLAY_ENDIAN_DEPENDENT,
"Este núcleo não suporta Netplay inter-arquitetura entre estes sistemas"
)

4
intl/msg_hash_pt_pt.h
View File

@ -54,10 +54,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"Você juntou-se como jogador %d"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"As implementações são diferentes. Certifique-se de que está a versão do RetroArch e do núcleo são as mesmas."
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"Este núcleo não suporta inter-arquitetura de Netplay entre estes sistemas"

4
intl/msg_hash_ru.h
View File

@ -59,10 +59,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"Вы присоединились под именем %d"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"Реализации различаются. Убедитесь, что вы используете одинаковые версии RetroArch и выбранного ядра."
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"Выбранное ядро не поддерживает архитектуру netplay между этими системами"

20
intl/msg_hash_us.h
View File

@ -71,8 +71,24 @@ MSG_HASH(
"%2$.*1$s has joined with input devices %4$.*3$s"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"Implementations differ. Make sure you're using the exact same versions of RetroArch and the core."
MSG_NETPLAY_NOT_RETROARCH,
"A netplay connection attempt failed because the peer is not running RetroArch, or is running an old version of RetroArch."
)
MSG_HASH(
MSG_NETPLAY_OUT_OF_DATE,
"The netplay peer is running an old version of RetroArch. Cannot connect."
)
MSG_HASH(
MSG_NETPLAY_DIFFERENT_VERSIONS,
"WARNING: A netplay peer is running a different version of RetroArch. If problems occur, use the same version."
)
MSG_HASH(
MSG_NETPLAY_DIFFERENT_CORES,
"A netplay peer is running a different core. Cannot connect."
)
MSG_HASH(
MSG_NETPLAY_DIFFERENT_CORE_VERSIONS,
"WARNING: A netlpay peer is running a different version of the core. If problems occur, use the same version."
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,

4
intl/msg_hash_vn.h
View File

@ -54,10 +54,6 @@ MSG_HASH(
MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
"You have joined as player %d"
)
MSG_HASH(
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
"Implementations differ. Make sure you're using the exact same versions of RetroArch and the core."
)
MSG_HASH(
MSG_NETPLAY_ENDIAN_DEPENDENT,
"This core does not support inter-architecture netplay between these systems"

6
msg_hash.h
View File

@ -165,7 +165,11 @@ enum msg_hash_enums
MSG_NETPLAY_PLAYER_S_LEFT,
MSG_NETPLAY_S_HAS_JOINED_AS_PLAYER_N,
MSG_NETPLAY_S_HAS_JOINED_WITH_INPUT_DEVICES_S,
MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
MSG_NETPLAY_NOT_RETROARCH,
MSG_NETPLAY_OUT_OF_DATE,
MSG_NETPLAY_DIFFERENT_VERSIONS,
MSG_NETPLAY_DIFFERENT_CORES,
MSG_NETPLAY_DIFFERENT_CORE_VERSIONS,
MSG_NETPLAY_ENDIAN_DEPENDENT,
MSG_NETPLAY_PLATFORM_DEPENDENT,
MSG_NETPLAY_ENTER_PASSWORD,

12
network/netplay/netplay_handshake.c
View File

@ -325,7 +325,7 @@ bool netplay_handshake_init(netplay_t *netplay,
if (ntohl(header[0]) != netplay_magic)
{
dmsg = msg_hash_to_str(MSG_NETPLAY_IMPLEMENTATIONS_DIFFER);
dmsg = msg_hash_to_str(MSG_NETPLAY_NOT_RETROARCH);
goto error;
}
@ -338,16 +338,14 @@ bool netplay_handshake_init(netplay_t *netplay,
remote_version = ntohl(header[4]);
if (remote_version < NETPLAY_PROTOCOL_VERSION)
{
/* FIXME: More precise information */
dmsg = msg_hash_to_str(MSG_NETPLAY_IMPLEMENTATIONS_DIFFER);
dmsg = msg_hash_to_str(MSG_NETPLAY_OUT_OF_DATE);
goto error;
}
if (ntohl(header[5]) != netplay_impl_magic())
{
/* We allow the connection but warn that this could cause issues. */
/* FIXME: More precise information */
dmsg = msg_hash_to_str(MSG_NETPLAY_IMPLEMENTATIONS_DIFFER);
dmsg = msg_hash_to_str(MSG_NETPLAY_DIFFERENT_VERSIONS);
RARCH_WARN("%s\n", dmsg);
runloop_msg_queue_push(dmsg, 1, 180, false);
}
@ -880,12 +878,11 @@ bool netplay_handshake_pre_info(netplay_t *netplay,
if (core_info)
{
/* FIXME: More precise messages */
dmsg = msg_hash_to_str(MSG_NETPLAY_IMPLEMENTATIONS_DIFFER);
if (strncmp(info_buf.core_name,
core_info->info.library_name, sizeof(info_buf.core_name)))
{
/* Wrong core! */
dmsg = msg_hash_to_str(MSG_NETPLAY_DIFFERENT_CORES);
RARCH_ERR("%s\n", dmsg);
runloop_msg_queue_push(dmsg, 1, 180, false);
/* FIXME: Should still send INFO, so the other side knows what's what */
@ -894,6 +891,7 @@ bool netplay_handshake_pre_info(netplay_t *netplay,
if (strncmp(info_buf.core_version,
core_info->info.library_version, sizeof(info_buf.core_version)))
{
dmsg = msg_hash_to_str(MSG_NETPLAY_DIFFERENT_CORE_VERSIONS);
RARCH_WARN("%s\n", dmsg);
runloop_msg_queue_push(dmsg, 1, 180, false);
}