diff --git a/runtime/quicksave.c b/runtime/quicksave.c index 008d111a..e81aeed5 100644 --- a/runtime/quicksave.c +++ b/runtime/quicksave.c @@ -215,7 +215,8 @@ static void save_wait(void) { // The game can take the request and still hold the autosave back (a fight in the Depths did): quick save then // takes its request back, so the game does not save some time later on its own, and says so if (plat_now_ms() - save_started > SAVE_MS) { - if (req_flags) ST8(req_flags, LD8(req_flags) & ~1u); + // Atomic: the game's job threads set and read other bits of this byte at the same time + if (req_flags) __atomic_fetch_and((uint8_t *)(uintptr_t)req_flags, (uint8_t)~1u, __ATOMIC_SEQ_CST); saving = 0; say(UI_QS_NOT_NOW, "quicksave: not now", req_flags ? "the game held the autosave back; the request is withdrawn" : "the game held its autosave back"); diff --git a/runtime/ui_text.c b/runtime/ui_text.c index 52605e2d..da9c15dd 100644 --- a/runtime/ui_text.c +++ b/runtime/ui_text.c @@ -333,7 +333,7 @@ static const char *const text_en[UI_TEXT_COUNT] = { [UI_QS_SAVED] = "Game saved", [UI_QS_LOADING] = "Loading the quick save", [UI_QS_NOT_NOW] = "Quick save is not possible right now", - [UI_QS_NONE] = "There is no quick save yet (F6 makes one)", + [UI_QS_NONE] = "There is no quick save yet (the quick save key makes one)", [UI_QS_FAILED] = "Quick save failed: see totk.log", [UI_QS_LOAD_FAILED] = "Quick load failed: see totk.log", [UI_MENU_MOUSE_SENS] = "Mouse camera sensitivity", @@ -920,7 +920,7 @@ static const char *const text_ru[UI_TEXT_COUNT] = { [UI_QS_SAVED] = "Игра сохранена", [UI_QS_LOADING] = "Загрузка быстрого сохранения", [UI_QS_NOT_NOW] = "Сейчас быстрое сохранение невозможно", - [UI_QS_NONE] = "Быстрого сохранения ещё нет (его делает F6)", + [UI_QS_NONE] = "Быстрого сохранения ещё нет (его делает клавиша быстрого сохранения)", [UI_QS_FAILED] = "Быстрое сохранение не удалось: см. totk.log", [UI_QS_LOAD_FAILED] = "Быстрая загрузка не удалась: см. totk.log", [UI_MENU_MOUSE_SENS] = "Чувствительность мыши", @@ -1668,7 +1668,7 @@ static const char *const text_pt_br[UI_TEXT_COUNT] = { [UI_QS_SAVED] = "Jogo salvo", [UI_QS_LOADING] = "Carregando o salvamento rápido", [UI_QS_NOT_NOW] = "Salvamento rápido não é possível agora", - [UI_QS_NONE] = "Ainda não há salvamento rápido (F6 faz um)", + [UI_QS_NONE] = "Ainda não há salvamento rápido (a tecla de salvamento rápido faz um)", [UI_QS_FAILED] = "O salvamento rápido falhou: veja o totk.log", [UI_QS_LOAD_FAILED] = "O carregamento rápido falhou: veja o totk.log", [UI_MENU_PROMPTS_MISSING] = "faltam os arquivos dos ícones: execute a instalação de novo", @@ -2404,7 +2404,7 @@ static const char *const text_zh_hans[UI_TEXT_COUNT] = { [UI_QS_SAVED] = "游戏已保存", [UI_QS_LOADING] = "正在读取快速存档", [UI_QS_NOT_NOW] = "现在无法快速存档", - [UI_QS_NONE] = "还没有快速存档(按 F6 创建)", + [UI_QS_NONE] = "还没有快速存档(按快速存档键创建)", [UI_QS_FAILED] = "快速存档失败:请查看 totk.log", [UI_QS_LOAD_FAILED] = "快速读档失败:请查看 totk.log", [UI_MENU_PROMPTS_MISSING] = "缺少按键提示文件:请重新运行安装程序",