From 3a37b7928677a7dc782cf0a30c2023cdc70442b8 Mon Sep 17 00:00:00 2001 From: MysterD Date: Tue, 15 Sep 2020 23:07:00 -0700 Subject: [PATCH] Renamed packet_save_file to packet_join --- src/pc/network/discord/activity.c | 2 +- src/pc/network/network.c | 4 ---- src/pc/network/network.h | 1 - src/pc/network/packets/packet.c | 4 ++-- src/pc/network/packets/packet.h | 14 +++++++------- .../packets/{packet_save_file.c => packet_join.c} | 14 +++++++------- src/pc/network/socket/socket.c | 2 +- 7 files changed, 18 insertions(+), 23 deletions(-) rename src/pc/network/packets/{packet_save_file.c => packet_join.c} (85%) diff --git a/src/pc/network/discord/activity.c b/src/pc/network/discord/activity.c index 29d5dc88a..c949da951 100644 --- a/src/pc/network/discord/activity.c +++ b/src/pc/network/discord/activity.c @@ -27,7 +27,7 @@ static void on_activity_join_callback(UNUSED void* data, enum EDiscordResult res discord_network_init(lobby->id); discord_activity_update(false); - network_on_joined(); + network_send_join_request(); } static void on_activity_join(UNUSED void* data, const char* secret) { diff --git a/src/pc/network/network.c b/src/pc/network/network.c index b0de6a090..d2cef0eb9 100644 --- a/src/pc/network/network.c +++ b/src/pc/network/network.c @@ -58,10 +58,6 @@ bool network_init(enum NetworkType inNetworkType) { return true; } -void network_on_joined(void) { - network_send_save_file_request(); -} - void network_on_init_level(void) { // reset loading timer networkLoadingLevel = 0; diff --git a/src/pc/network/network.h b/src/pc/network/network.h index dea2cd2ad..5e2758538 100644 --- a/src/pc/network/network.h +++ b/src/pc/network/network.h @@ -78,7 +78,6 @@ void network_on_init_level(void); void network_on_loaded_level(void); void network_send(struct Packet* p); void network_receive(u8* data, u16 dataLength); -void network_on_joined(void); void network_update(void); void network_shutdown(void); diff --git a/src/pc/network/packets/packet.c b/src/pc/network/packets/packet.c index c369771fa..2e1247efb 100644 --- a/src/pc/network/packets/packet.c +++ b/src/pc/network/packets/packet.c @@ -16,8 +16,8 @@ void packet_receive(struct Packet* p) { case PACKET_COLLECT_ITEM: network_receive_collect_item(p); break; case PACKET_RESERVATION_REQUEST: network_receive_reservation_request(p); break; case PACKET_RESERVATION: network_receive_reservation(p); break; - case PACKET_SAVE_FILE_REQUEST: network_receive_save_file_request(p); break; - case PACKET_SAVE_FILE: network_receive_save_file(p); break; + case PACKET_JOIN_REQUEST: network_receive_join_request(p); break; + case PACKET_JOIN: network_receive_join(p); break; case PACKET_CHAT: network_receive_chat(p); break; case PACKET_CUSTOM: network_receive_custom(p); break; default: LOG_ERROR("received unknown packet: %d", p->buffer[0]); diff --git a/src/pc/network/packets/packet.h b/src/pc/network/packets/packet.h index 0ee1588ed..a777ccaf6 100644 --- a/src/pc/network/packets/packet.h +++ b/src/pc/network/packets/packet.h @@ -22,8 +22,8 @@ enum PacketType { PACKET_COLLECT_ITEM, PACKET_RESERVATION_REQUEST, PACKET_RESERVATION, - PACKET_SAVE_FILE_REQUEST, - PACKET_SAVE_FILE, + PACKET_JOIN_REQUEST, + PACKET_JOIN, PACKET_CHAT, PACKET_CUSTOM = 255, }; @@ -105,11 +105,11 @@ void network_receive_reservation_request(UNUSED struct Packet* p); void network_send_reservation(void); void network_receive_reservation(struct Packet* p); -// packet_save_file.c -void network_send_save_file_request(void); -void network_receive_save_file_request(UNUSED struct Packet* p); -void network_send_save_file(void); -void network_receive_save_file(struct Packet* p); +// packet_join.c +void network_send_join_request(void); +void network_receive_join_request(UNUSED struct Packet* p); +void network_send_join(void); +void network_receive_join(struct Packet* p); // packet_custom.c u8 network_register_custom_packet(void (*send_callback)(struct Packet* p, void* params), void (*receive_callback)(struct Packet* p)); diff --git a/src/pc/network/packets/packet_save_file.c b/src/pc/network/packets/packet_join.c similarity index 85% rename from src/pc/network/packets/packet_save_file.c rename to src/pc/network/packets/packet_join.c index 6e792c71b..54c3757b6 100644 --- a/src/pc/network/packets/packet_save_file.c +++ b/src/pc/network/packets/packet_join.c @@ -15,22 +15,22 @@ extern u8* gOverrideEeprom; static u8 eeprom[512] = { 0 }; -void network_send_save_file_request(void) { +void network_send_join_request(void) { assert(gNetworkType == NT_CLIENT); gOverrideEeprom = eeprom; struct Packet p; - packet_init(&p, PACKET_SAVE_FILE_REQUEST, true); + packet_init(&p, PACKET_JOIN_REQUEST, true); network_send(&p); } -void network_receive_save_file_request(UNUSED struct Packet* p) { +void network_receive_join_request(UNUSED struct Packet* p) { assert(gNetworkType == NT_SERVER); - network_send_save_file(); + network_send_join(); } -void network_send_save_file(void) { +void network_send_join(void) { assert(gNetworkType == NT_SERVER); fs_file_t* fp = fs_open(SAVE_FILENAME); @@ -42,7 +42,7 @@ void network_send_save_file(void) { char hash[HASH_LENGTH] = GIT_HASH; struct Packet p; - packet_init(&p, PACKET_SAVE_FILE, true); + packet_init(&p, PACKET_JOIN, true); packet_write(&p, &hash, sizeof(u8) * HASH_LENGTH); packet_write(&p, &gCurrSaveFileNum, sizeof(s16)); packet_write(&p, &gServerSettings.playerInteractions, sizeof(u8)); @@ -52,7 +52,7 @@ void network_send_save_file(void) { network_send(&p); } -void network_receive_save_file(struct Packet* p) { +void network_receive_join(struct Packet* p) { assert(gNetworkType == NT_CLIENT); gOverrideEeprom = eeprom; diff --git a/src/pc/network/socket/socket.c b/src/pc/network/socket/socket.c index 84227befe..d815010fc 100644 --- a/src/pc/network/socket/socket.c +++ b/src/pc/network/socket/socket.c @@ -78,7 +78,7 @@ static bool ns_socket_initialize(enum NetworkType networkType) { gOpenConnectMenu = TRUE; gNetworkType = NT_CLIENT; - network_on_joined(); + network_send_join_request(); } LOG_INFO("initialized");