From daaa1b3ed21f4ea7ffe08b25485c222f7923d717 Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 25 May 2016 21:03:18 +0100 Subject: [PATCH] add helper method for getting the keymap path --- src/network/network.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/network/network.cpp b/src/network/network.cpp index 9152a3ab0a..f79de834c0 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -113,6 +113,7 @@ void network_chat_show_connected_message(); static void network_get_keys_directory(utf8 *buffer, size_t bufferSize); static void network_get_private_key_path(utf8 *buffer, size_t bufferSize, const utf8 * playerName); static void network_get_public_key_path(utf8 *buffer, size_t bufferSize, const utf8 * playerName, const utf8 * hash); +static void network_get_keymap_path(utf8 *buffer, size_t bufferSize); NetworkPacket::NetworkPacket() { @@ -1424,9 +1425,7 @@ void Network::SaveKeyMappings() { if (GetMode() == NETWORK_MODE_SERVER) { utf8 path[MAX_PATH]; - - platform_get_user_directory(path, NULL); - strcat(path, "keymappings.json"); + network_get_keymap_path(path, sizeof(path)); json_t * jsonKeyMappings = json_array(); for (auto it = key_group_map.cbegin(); it != key_group_map.cend(); it++) { @@ -1453,11 +1452,8 @@ void Network::SaveKeyMappings() void Network::LoadKeyMappings() { - utf8 path[MAX_PATH]; - - platform_get_user_directory(path, NULL); - strcat(path, "keymappings.json"); + network_get_keymap_path(path, sizeof(path)); if (!platform_file_exists(path)) { return; @@ -2875,6 +2871,12 @@ static void network_get_public_key_path(utf8 *buffer, size_t bufferSize, const u String::Append(buffer, bufferSize, ".pubkey"); } +static void network_get_keymap_path(utf8 *buffer, size_t bufferSize) +{ + platform_get_user_directory(buffer, NULL); + Path::Append(buffer, bufferSize, "keymappings.json"); +} + #else int network_get_mode() { return NETWORK_MODE_NONE; } int network_get_status() { return NETWORK_STATUS_NONE; }