diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 8105929200..0f8acd0644 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -1982,8 +1982,18 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Reverting savefile directory to"; case MSG_REVERTING_SAVESTATE_DIRECTORY_TO: return "Reverting savestate directory to"; + case MSG_COULD_NOT_READ_MOVIE_HEADER: + return "Could not read movie header."; + case MSG_MOVIE_FORMAT_DIFFERENT_SERIALIZER_VERSION: + return "Movie format seems to have a different serializer version. Will most likely fail."; + case MSG_CRC32_CHECKSUM_MISMATCH: + return "CRC32 checksum mismatch between content file and saved content checksum in replay file header; replay highly likely to desync on playback."; case MSG_ERROR_PARSING_ARGUMENTS: return "Error parsing arguments."; + case MSG_FAILED_TO_PATCH: + return "Failed to patch"; + case MSG_CONTENT_PATCHED_SUCCESSFULLY_IN: + return "Content patched successfully"; case MSG_FATAL_ERROR_RECEIVED_IN: return "Fatal error received in"; case MSG_MOVIE_RECORD_STOPPED: diff --git a/movie.c b/movie.c index 933a3eadbe..f96957dfb6 100644 --- a/movie.c +++ b/movie.c @@ -84,7 +84,7 @@ static bool init_playback(bsv_movie_t *handle, const char *path) if (fread(header, sizeof(uint32_t), 4, handle->file) != 4) { - RARCH_ERR("Couldn't read movie header.\n"); + RARCH_ERR("%s\n", msg_hash_to_str(MSG_COULD_NOT_READ_MOVIE_HEADER)); return false; } @@ -100,7 +100,7 @@ static bool init_playback(bsv_movie_t *handle, const char *path) content_get_crc(&content_crc_ptr); if (swap_if_big32(header[CRC_INDEX]) != *content_crc_ptr) - RARCH_WARN("CRC32 checksum mismatch between content file and saved content checksum in replay file header; replay highly likely to desync on playback.\n"); + RARCH_WARN("%s.\n", msg_hash_to_str(MSG_CRC32_CHECKSUM_MISMATCH)); state_size = swap_if_big32(header[STATE_SIZE_INDEX]); @@ -129,7 +129,8 @@ static bool init_playback(bsv_movie_t *handle, const char *path) core_unserialize(&serial_info); } else - RARCH_WARN("Movie format seems to have a different serializer version. Will most likely fail.\n"); + RARCH_WARN("%s\n", + msg_hash_to_str(MSG_MOVIE_FORMAT_DIFFERENT_SERIALIZER_VERSION)); } handle->min_file_pos = sizeof(header) + state_size; diff --git a/msg_hash.h b/msg_hash.h index 8080251ef6..064876f548 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -35,7 +35,12 @@ enum msg_hash_enums MSG_RECEIVED, MSG_LOADING_CONTENT_FILE, MSG_FATAL_ERROR_RECEIVED_IN, + MSG_FAILED_TO_PATCH, + MSG_COULD_NOT_READ_MOVIE_HEADER, + MSG_CRC32_CHECKSUM_MISMATCH, + MSG_CONTENT_PATCHED_SUCCESSFULLY_IN, MSG_USING_LIBRETRO_DUMMY_CORE_RECORDING_SKIPPED, + MSG_MOVIE_FORMAT_DIFFERENT_SERIALIZER_VERSION, MSG_RECORDING_TERMINATED_DUE_TO_RESIZE, MSG_FAILED_TO_START_RECORDING, MSG_REVERTING_SAVEFILE_DIRECTORY_TO, diff --git a/patch.c b/patch.c index 97e1fb55e5..0feb96d2bb 100644 --- a/patch.c +++ b/patch.c @@ -29,6 +29,7 @@ #include #include +#include "msg_hash.h" #include "patch.h" #include "runloop.h" #include "verbosity.h" @@ -548,11 +549,15 @@ static bool apply_patch_content(uint8_t **buf, if (err == PATCH_SUCCESS) { - RARCH_LOG("Content patched successfully (%s).\n", patch_desc); + RARCH_LOG("%s (%s).\n", + msg_hash_to_str(MSG_FATAL_ERROR_RECEIVED_IN), + patch_desc); success = true; } else - RARCH_ERR("Failed to patch %s: Error #%u\n", patch_desc, + RARCH_ERR("%s %s: Error #%u\n", + msg_hash_to_str(MSG_FAILED_TO_PATCH), + patch_desc, (unsigned)err); if (success)