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

Cleanups/more translation work

This commit is contained in:
twinaphex 2016-10-22 05:13:37 +02:00
parent 1b944c1cce
commit e11b170173
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intl/msg_hash_us.c
View File

@ -1926,6 +1926,8 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
return "succeeded"; return "succeeded";
case MSG_FAILED: case MSG_FAILED:
return "failed"; return "failed";
case MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER:
return "File already exists. Saving to backup buffer";
case MSG_AUTOLOADING_SAVESTATE_FROM: case MSG_AUTOLOADING_SAVESTATE_FROM:
return "Auto-loading savestate from"; return "Auto-loading savestate from";
case MSG_REBOOTING: case MSG_REBOOTING:

1
msg_hash.h
View File

@ -214,6 +214,7 @@ enum msg_hash_enums
MSG_AUTOCONFIG_FILE_SAVED_SUCCESSFULLY, MSG_AUTOCONFIG_FILE_SAVED_SUCCESSFULLY,
MSG_AUTOCONFIG_FILE_ERROR_SAVING, MSG_AUTOCONFIG_FILE_ERROR_SAVING,
MSG_OVERRIDES_ERROR_SAVING, MSG_OVERRIDES_ERROR_SAVING,
MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER,
MSG_AUTOLOADING_SAVESTATE_FROM, MSG_AUTOLOADING_SAVESTATE_FROM,
MSG_FOUND_AUTO_SAVESTATE_IN, MSG_FOUND_AUTO_SAVESTATE_IN,
MSG_SRAM_WILL_NOT_BE_SAVED, MSG_SRAM_WILL_NOT_BE_SAVED,

25
tasks/task_save.c
View File

@ -378,8 +378,10 @@ bool content_undo_load_state(void)
undo_load_buf.size, undo_load_buf.size,
msg_hash_to_str(MSG_BYTES)); msg_hash_to_str(MSG_BYTES));
/* TODO/FIXME - This checking of SRAM overwrite, the backing up of it and /* TODO/FIXME - This checking of SRAM overwrite,
its flushing could all be in their own functions... */ * the backing up of it and
* its flushing could all be in their
* own functions... */
if (settings->block_sram_overwrite && task_save_files if (settings->block_sram_overwrite && task_save_files
&& task_save_files->size) && task_save_files->size)
{ {
@ -527,9 +529,9 @@ static void task_save_handler_finished(retro_task_t *task,
**/ **/
static void task_save_handler(retro_task_t *task) static void task_save_handler(retro_task_t *task)
{ {
save_task_state_t *state = (save_task_state_t*)task->state;
int written; int written;
ssize_t remaining; ssize_t remaining;
save_task_state_t *state = (save_task_state_t*)task->state;
if (!state->file) if (!state->file)
{ {
@ -540,8 +542,8 @@ static void task_save_handler(retro_task_t *task)
} }
remaining = MIN(state->size - state->written, SAVE_STATE_CHUNK); remaining = MIN(state->size - state->written, SAVE_STATE_CHUNK);
written = filestream_write(state->file,
written = filestream_write(state->file, (uint8_t*)state->data + state->written, remaining); (uint8_t*)state->data + state->written, remaining);
state->written += written; state->written += written;
@ -673,6 +675,7 @@ static void task_load_handler_finished(retro_task_t *task,
save_task_state_t *state) save_task_state_t *state)
{ {
load_task_data_t *task_data = NULL; load_task_data_t *task_data = NULL;
task->finished = true; task->finished = true;
if (state->file) if (state->file)
@ -697,9 +700,8 @@ static void task_load_handler_finished(retro_task_t *task,
**/ **/
static void task_load_handler(retro_task_t *task) static void task_load_handler(retro_task_t *task)
{ {
ssize_t remaining, bytes_read;
save_task_state_t *state = (save_task_state_t*)task->state; save_task_state_t *state = (save_task_state_t*)task->state;
ssize_t remaining;
ssize_t bytes_read;
if (!state->file) if (!state->file)
{ {
@ -725,9 +727,8 @@ static void task_load_handler(retro_task_t *task)
} }
remaining = MIN(state->size - state->bytes_read, SAVE_STATE_CHUNK); remaining = MIN(state->size - state->bytes_read, SAVE_STATE_CHUNK);
bytes_read = filestream_read(state->file,
bytes_read = filestream_read(state->file, (uint8_t*)state->data + state->bytes_read, remaining); (uint8_t*)state->data + state->bytes_read, remaining);
state->bytes_read += bytes_read; state->bytes_read += bytes_read;
if (state->size > 0) if (state->size > 0)
@ -1126,8 +1127,8 @@ bool content_save_state(const char *path, bool save_to_disk, bool autosave)
/* Before overwritting the savestate file, load it into a buffer /* Before overwritting the savestate file, load it into a buffer
to allow undo_save_state() to work */ to allow undo_save_state() to work */
/* TODO/FIXME - Use msg_hash_to_str here */ /* TODO/FIXME - Use msg_hash_to_str here */
RARCH_LOG("%s\n", RARCH_LOG("%s ...\n",
"File already exists. Saving to backup buffer..."); msg_hash_to_str(MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER));
task_push_load_and_save_state(path, data, info.size, true, autosave); task_push_load_and_save_state(path, data, info.size, true, autosave);
} }