diff --git a/assets/l10n/en_US.json b/assets/l10n/en_US.json index 367e644..ce66a28 100644 --- a/assets/l10n/en_US.json +++ b/assets/l10n/en_US.json @@ -67,7 +67,6 @@ "game.edit.cover-image-delete.label": "Delete cover image", "game.edit.cover-image-empty": "No cover image", "game.edit.override-settings.label": "Override emulation settings", - "game.edit.cue-enabled.label": "Enable creation of .cue file", "game.edit.netplay-enabled.label": "Netplay enabled", "game.edit.netplay-require-login.label": "Require login for netplay", "game.edit.netplay-open.label": "Show in open netplay games", @@ -228,6 +227,7 @@ "settings-platform.emulation.threads.label": "Use threads", "settings-platform.emulation.disable-vsync.label": "Disable VSync", "settings-platform.emulation.disable-browser-db.label": "Disable browser DB", + "settings-platform.emulation.cue-enabled.label": "Enable creation of .cue file", "settings-platform.core.title": "Core", "settings-platform.core.empty": "No options for selected core", "settings-platform.play.title": "Play", diff --git a/assets/l10n/ru_RU.json b/assets/l10n/ru_RU.json index 9fd3245..1703cd7 100644 --- a/assets/l10n/ru_RU.json +++ b/assets/l10n/ru_RU.json @@ -67,7 +67,6 @@ "game.edit.cover-image-delete.label": "Удалить обложку", "game.edit.cover-image-empty": "Нет обложки", "game.edit.override-settings.label": "Переопределить настройки эмуляции", - "game.edit.cue-enabled.label": "Включить создание файлов .cue", "game.edit.netplay-enabled.label": "Включить сетевую игру", "game.edit.netplay-require-login.label": "Требовать вход для сетевой игры", "game.edit.netplay-open.label": "Показать в списке открытых сетевых игр", @@ -228,6 +227,7 @@ "settings-platform.emulation.threads.label": "Использовать потоки", "settings-platform.emulation.disable-vsync.label": "Отключить вертикальную синхронизацию", "settings-platform.emulation.disable-browser-db.label": "Отключить использование БД браузера", + "settings-platform.emulation.cue-enabled.label": "Включить создание файлов .cue", "settings-platform.core.title": "Ядро", "settings-platform.core.empty": "Нет настроек для выбранного ядра", "settings-platform.play.title": "Игра", diff --git a/storage/defaults.go b/storage/defaults.go index 3b39ede..27c2ab7 100644 --- a/storage/defaults.go +++ b/storage/defaults.go @@ -1110,6 +1110,7 @@ func DefaultEmulatorSettings(systemType string) EmulatorSettings { settings.Shader = Shaders[0].Value settings.Buttons = DefaultButtons settings.Controls = [4]EmulatorControls{controls} + settings.CueEnabled = true return settings } diff --git a/storage/types.go b/storage/types.go index 8b43acb..0e5549a 100644 --- a/storage/types.go +++ b/storage/types.go @@ -42,7 +42,6 @@ type Game struct { NetplaySessionId string NetplayRequireLogin bool NetplayOpen bool - CueEnabled bool AutoSaveEnabled bool AutoSaveInterval int AutoSaveCapacity int @@ -90,6 +89,7 @@ type EmulatorSettings struct { Threads bool DisableBrowserDB bool DisableVSync bool + CueEnabled bool } type EmulatorControls struct { diff --git a/templates/includes/form_game.twig b/templates/includes/form_game.twig index 1ddc204..f5a34bf 100644 --- a/templates/includes/form_game.twig +++ b/templates/includes/form_game.twig @@ -54,13 +54,6 @@ -
-
- - -
-
- {% if netplay_enabled %}
diff --git a/templates/includes/platform_settings/emulation.twig b/templates/includes/platform_settings/emulation.twig index c6656db..70366c2 100644 --- a/templates/includes/platform_settings/emulation.twig +++ b/templates/includes/platform_settings/emulation.twig @@ -33,5 +33,11 @@
+
+
+ + +
+
diff --git a/templates/play.twig b/templates/play.twig index eccb833..4eb5aa0 100644 --- a/templates/play.twig +++ b/templates/play.twig @@ -85,7 +85,7 @@ window.EJS_disableDatabases = true; {% endif %} - {% if not game.CueEnabled %} + {% if not emulator_settings.CueEnabled %} window.EJS_disableCue = true; {% endif %} diff --git a/web/handlers_game.go b/web/handlers_game.go index 2222fc4..45b2438 100644 --- a/web/handlers_game.go +++ b/web/handlers_game.go @@ -66,7 +66,6 @@ func (s *Server) gameUpload(c echo.Context) error { OriginalFileExtension: getFileExtension(file.Filename), OriginalFileSize: file.Size, Platform: "", - CueEnabled: true, AutoSaveEnabled: false, AutoSaveInterval: 5 * 60, AutoSaveCapacity: 10, @@ -177,7 +176,6 @@ func (s *Server) gameEditSubmit(c echo.Context) error { game.Name = c.FormValue("name") game.Description = c.FormValue("description") game.OverrideEmulatorSettings = c.FormValue("override-settings") == "1" - game.CueEnabled = c.FormValue("cue-enabled") == "1" game.NetplayEnabled = c.FormValue("netplay-enabled") == "1" game.NetplayRequireLogin = c.FormValue("netplay-require-login") == "1" game.NetplayOpen = c.FormValue("netplay-open") == "1" diff --git a/web/handlers_settings.go b/web/handlers_settings.go index 98f720a..49cea74 100644 --- a/web/handlers_settings.go +++ b/web/handlers_settings.go @@ -204,6 +204,7 @@ func settingsCollectFormData(c echo.Context) storage.EmulatorSettings { Threads: c.FormValue("threads") == "1", DisableBrowserDB: c.FormValue("disable-browser-db") == "1", DisableVSync: c.FormValue("disable-vsync") == "1", + CueEnabled: c.FormValue("cue-enabled") == "1", Buttons: buttons, Controls: settingsCollectControls(c), CoreOptions: coreOptionsValues,