diff --git a/overlay_experimental/overlay/steam_overlay.h b/overlay_experimental/overlay/steam_overlay.h index c1fe5409..9c08462f 100644 --- a/overlay_experimental/overlay/steam_overlay.h +++ b/overlay_experimental/overlay/steam_overlay.h @@ -128,10 +128,6 @@ class Steam_Overlay bool show_achievements = false; bool show_settings = false; - // disable input when force_*.txt file is used - bool disable_user_input = false; - // warn when force_*.txt file is used - bool warn_forced_setting = false; // warn when using local save bool warn_local_save = false; // warn when app ID = 0 diff --git a/overlay_experimental/overlay/steam_overlay_translations.h b/overlay_experimental/overlay/steam_overlay_translations.h index 65b68a0f..3ab6ef2c 100644 --- a/overlay_experimental/overlay/steam_overlay_translations.h +++ b/overlay_experimental/overlay/steam_overlay_translations.h @@ -2689,99 +2689,7 @@ const char translationWarningWarningWarning[TRANSLATION_NUMBER_OF_LANGUAGES][TRA u8"UPOZORENJE UPOZORENJE UPOZORENJE" }; -const char translationWarningDescription1[TRANSLATION_NUMBER_OF_LANGUAGES][TRANSLATION_BUFFER_SIZE] = { - // 0 - English - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 1 - Arabic - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 2 - Bulgarian - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 3 - Simplified Chinese - u8"检测到一些 steam_settings/force_*.txt 文件。如果您想让这个菜单工作，请删除它们。", - - // 4 - Traditional Chinese - u8"檢測到一些 steam_settings/force_*.txt 檔案。如果您想讓這個選單工作，請刪除它們。", - - // 5 - Czech - u8"Byly zjištěny soubory steam_settings/force_*.txt. Pokud chcete, aby toto menu fungovalo, odstraňte je.", - - // 6 - Danish - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 7 - Dutch - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 8 - Finnish - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 9 - French - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 10 - German - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 11 - Greek - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 12 - Hungarian - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 13 - Italian - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 14 - Japanese - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 15 - Korean - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 16 - Norwegian - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 17 - Polish - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 18 - Portuguese - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 19 - Brazilian Portuguese - u8"Alguns arquivos steam_settings/force_*.txt foram detectados. Exclua-os se quiser que este menu funcione.", - - // 20 - Romanian - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 21 - Russian - u8"Обнаружены файлы steam_settings/force_*.txt. Пожалуйста, удалите их, если хотите, чтобы это меню работало.", - - // 22 - Spanish - u8"Un archivo de steam_settings/force_*.txt ha sido detectado. Por favor bórralo si quieres que el menu funcione.", - - // 23 - Latin American - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 24 - Swedish - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 25 - Thai - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 26 - Turkish - u8"Bazı steam_settings/force_*.txt dosyaları tespit edildi. Bu menünün çalışmasını istiyorsanız lütfen bunları silin.", - - // 27 - Ukrainian - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 28 - Vietnamese - u8"Some steam_settings/force_*.txt files have been detected. Please delete them if you want this menu to work.", - - // 29 - Croatian - u8"Neke steam_settings/force_*.txt datoteke su otkrivene. Molimo da ih izbrišete ako želite da ovaj izbornik radi." -}; - -const char translationWarningDescription2[TRANSLATION_NUMBER_OF_LANGUAGES][TRANSLATION_BUFFER_SIZE] = { +const char translationWarningDescription_badAppid[TRANSLATION_NUMBER_OF_LANGUAGES][TRANSLATION_BUFFER_SIZE] = { // 0 - English u8"AppID is 0, please create a steam_appid.txt with the right appid and restart the game.", @@ -2873,188 +2781,96 @@ const char translationWarningDescription2[TRANSLATION_NUMBER_OF_LANGUAGES][TRANS u8"AppID je 0, molimo napravite steam_appid.txt sa točnim appid-em i ponovo pokrenite igru." }; -const char translationWarningDescription3[TRANSLATION_NUMBER_OF_LANGUAGES][TRANSLATION_BUFFER_SIZE] = { +const char translationWarningDescription_localSave[TRANSLATION_NUMBER_OF_LANGUAGES][TRANSLATION_BUFFER_SIZE] = { // 0 - English - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 1 - Arabic - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 2 - Bulgarian - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 3 - Simplified Chinese - u8"检测到 local_save.txt ，模拟器数据将保存到本地游戏文件夹。如果不想要此行为请删除该文件。", + u8"检测到 local_save_path ，模拟器数据将保存到本地游戏文件夹。如果不想要此行为请删除该文件。", // 4 - Traditional Chinese - u8"檢測到 local_save.txt ，模擬器資料將儲存到本地遊戲資料夾。如果不想要此行為請刪除該檔案。", + u8"檢測到 local_save_path ，模擬器資料將儲存到本地遊戲資料夾。如果不想要此行為請刪除該檔案。", // 5 - Czech - u8"Zjištěn local_save.txt, emulátor ukládá lokálně do složky hry. Pokud to nechcete, odstraňte ho.", + u8"Zjištěn local_save_path, emulátor ukládá lokálně do složky hry. Pokud to nechcete, odstraňte ho.", // 6 - Danish - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 7 - Dutch - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 8 - Finnish - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 9 - French - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 10 - German - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 11 - Greek - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 12 - Hungarian - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 13 - Italian - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 14 - Japanese - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 15 - Korean - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 16 - Norwegian - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 17 - Polish - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 18 - Portuguese - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 19 - Brazilian Portuguese - u8"local_save.txt detectado, o emu está salvando localmente na pasta do jogo. Por favor, exclua-o se você não quiser isso.", + u8"local_save_path detectado, o emu está salvando localmente na pasta do jogo. Por favor, exclua-o se você não quiser isso.", // 20 - Romanian - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 21 - Russian - u8"Обнаружен файл local_save.txt, эмулятор сохраняет локально в папку с игрой, если вам это не нужно, удалите его.", + u8"Обнаружен файл local_save_path, эмулятор сохраняет локально в папку с игрой, если вам это не нужно, удалите его.", // 22 - Spanish - u8"local_save.txt detectado, el emulador está guardando en la carpeta del juego. Por favor bórralo si no quieres esto.", + u8"local_save_path detectado, el emulador está guardando en la carpeta del juego. Por favor bórralo si no quieres esto.", // 23 - Latin American - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 24 - Swedish - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 25 - Thai - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 26 - Turkish - u8"local_save.txt tespit edildi, öykünücü yerel olarak oyun klasörüne kaydediyor. Eğer bunu istemiyorsanız lütfen silin.", + u8"local_save_path tespit edildi, öykünücü yerel olarak oyun klasörüne kaydediyor. Eğer bunu istemiyorsanız lütfen silin.", // 27 - Ukrainian - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 28 - Vietnamese - u8"local_save.txt detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", + u8"local_save_path detected, the emu is saving locally to the game folder. Please delete it if you don't want this.", // 29 - Croatian - u8"Datoteka local_save.txt je otkrivena u mapi igre. Molimo vas da je obiršete ako ne želite ovo." -}; - -const char translationWarningDescription4[TRANSLATION_NUMBER_OF_LANGUAGES][TRANSLATION_BUFFER_SIZE] = { - // 0 - English - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 1 - Arabic - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 2 - Bulgarian - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 3 - Simplified Chinese - u8"检测到一些 steam_settings/force_*.txt 文件。您将无法保存某些设置。", - - // 4 - Traditional Chinese - u8"檢測到一些 steam_settings/force_*.txt 檔案。您將無法儲存某些設定。", - - // 5 - Czech - u8"Byly zjištěny soubory steam_settings/force_*.txt. Některá nastavení nebude možné uložit.", - - // 6 - Danish - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 7 - Dutch - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 8 - Finnish - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 9 - French - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 10 - German - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 11 - Greek - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 12 - Hungarian - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 13 - Italian - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 14 - Japanese - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 15 - Korean - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 16 - Norwegian - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 17 - Polish - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 18 - Portuguese - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 19 - Brazilian Portuguese - u8"Alguns arquivos steam_settings/force_*.txt foram detectados. Você não poderá salvar algumas configurações.", - - // 20 - Romanian - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 21 - Russian - u8"Обнаружены файлы steam_settings/force_*.txt. Вы не сможете сохранить некоторые настройки.", - - // 22 - Spanish - u8"Un archivo steam_settings/force_*.txt ha sido detectado. No podrás guardar ciertas configuraciones.", - - // 23 - Latin American - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 24 - Swedish - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 25 - Thai - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 26 - Turkish - u8"Bazı steam_settings/force_*.txt dosyaları tespit edildi. Bazı ayarları kaydedemeyeceksiniz.", - - // 27 - Ukrainian - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 28 - Vietnamese - u8"Some steam_settings/force_*.txt files have been detected. You will not be able to save some settings.", - - // 29 - Croatian - u8"Neke steam_settings/force_*.txt datoteke su otkrivene. Možda nećete moći spremiti neke postavke." + u8"Datoteka local_save_path je otkrivena u mapi igre. Molimo vas da je obiršete ako ne želite ovo." }; const char translationSteamOverlayURL[TRANSLATION_NUMBER_OF_LANGUAGES][TRANSLATION_BUFFER_SIZE] = { diff --git a/overlay_experimental/steam_overlay.cpp b/overlay_experimental/steam_overlay.cpp index 316fc1e4..05a75313 100644 --- a/overlay_experimental/steam_overlay.cpp +++ b/overlay_experimental/steam_overlay.cpp @@ -115,15 +115,11 @@ Steam_Overlay::Steam_Overlay(Settings* settings, Local_Storage *local_storage, S // we need these copies to show the warning only once, then disable the flag // avoid manipulating settings->xxx - this->warn_forced_setting = - !settings->disable_overlay_warning_any && !settings->disable_overlay_warning_forced_setting && settings->overlay_warn_forced_setting; this->warn_local_save = !settings->disable_overlay_warning_any && !settings->disable_overlay_warning_local_save && settings->overlay_warn_local_save; this->warn_bad_appid = !settings->disable_overlay_warning_any && !settings->disable_overlay_warning_bad_appid && settings->get_local_game_id().AppID() == 0; - this->disable_user_input = this->warn_forced_setting; - current_language = 0; const char *language = settings->get_language(); @@ -283,10 +279,8 @@ void Steam_Overlay::create_fonts() font_builder.AddText(translationSave[i]); font_builder.AddText(translationWarning[i]); font_builder.AddText(translationWarningWarningWarning[i]); - font_builder.AddText(translationWarningDescription1[i]); - font_builder.AddText(translationWarningDescription2[i]); - font_builder.AddText(translationWarningDescription3[i]); - font_builder.AddText(translationWarningDescription4[i]); + font_builder.AddText(translationWarningDescription_badAppid[i]); + font_builder.AddText(translationWarningDescription_localSave[i]); font_builder.AddText(translationSteamOverlayURL[i]); font_builder.AddText(translationClose[i]); font_builder.AddText(translationPlaying[i]); @@ -1367,7 +1361,7 @@ void Steam_Overlay::render_main_window() ImGui::Text("%s", translationUsername[current_language]); ImGui::SameLine(); - ImGui::InputText("##username", username_text, sizeof(username_text), disable_user_input ? ImGuiInputTextFlags_ReadOnly : 0); + ImGui::InputText("##username", username_text, sizeof(username_text), 0); ImGui::Separator(); @@ -1377,16 +1371,10 @@ void Steam_Overlay::render_main_window() ImGui::Separator(); - if (!disable_user_input) { - ImGui::Text("%s", translationRestartTheGameToApply[current_language]); - if (ImGui::Button(translationSave[current_language])) { - save_settings = true; - show_settings = false; - } - } else { - ImGui::TextColored(ImVec4(255, 0, 0, 255), "%s", translationWarningWarningWarning[current_language]); - ImGui::TextWrapped("%s", translationWarningDescription1[current_language]); - ImGui::TextColored(ImVec4(255, 0, 0, 255), "%s", translationWarningWarningWarning[current_language]); + ImGui::Text("%s", translationRestartTheGameToApply[current_language]); + if (ImGui::Button(translationSave[current_language])) { + save_settings = true; + show_settings = false; } } @@ -1413,7 +1401,7 @@ void Steam_Overlay::render_main_window() ImGui::End(); } - bool show_warning = warn_local_save || warn_forced_setting || warn_bad_appid; + bool show_warning = warn_local_save || warn_bad_appid; if (show_warning) { ImGui::SetNextWindowSizeConstraints(ImVec2(ImGui::GetFontSize() * 32, ImGui::GetFontSize() * 32), ImVec2(8192, 8192)); ImGui::SetNextWindowFocus(); @@ -1421,24 +1409,19 @@ void Steam_Overlay::render_main_window() if (ImGui::Begin(translationWarning[current_language], &show_warning)) { if (warn_bad_appid) { ImGui::TextColored(ImVec4(255, 0, 0, 255), "%s", translationWarningWarningWarning[current_language]); - ImGui::TextWrapped("%s", translationWarningDescription2[current_language]); + ImGui::TextWrapped("%s", translationWarningDescription_badAppid[current_language]); ImGui::TextColored(ImVec4(255, 0, 0, 255), "%s", translationWarningWarningWarning[current_language]); } if (warn_local_save) { ImGui::TextColored(ImVec4(255, 0, 0, 255), "%s", translationWarningWarningWarning[current_language]); - ImGui::TextWrapped("%s", translationWarningDescription3[current_language]); - ImGui::TextColored(ImVec4(255, 0, 0, 255), "%s", translationWarningWarningWarning[current_language]); - } - if (warn_forced_setting) { - ImGui::TextColored(ImVec4(255, 0, 0, 255), "%s", translationWarningWarningWarning[current_language]); - ImGui::TextWrapped("%s", translationWarningDescription4[current_language]); + ImGui::TextWrapped("%s", translationWarningDescription_localSave[current_language]); ImGui::TextColored(ImVec4(255, 0, 0, 255), "%s", translationWarningWarningWarning[current_language]); } } ImGui::End(); if (!show_warning) { - warn_local_save = warn_forced_setting = false; + warn_local_save = false; } } } @@ -1499,7 +1482,7 @@ void Steam_Overlay::steam_run_callback() save_settings = false; const char *language_text = valid_languages[current_language]; - save_global_settings(get_steam_client()->local_storage, username_text, language_text); + save_global_settings(username_text, language_text); get_steam_client()->settings_client->set_local_name(username_text); get_steam_client()->settings_server->set_local_name(username_text); get_steam_client()->settings_client->set_language(language_text);