diff --git a/frontend/react/src/olympusapp.ts b/frontend/react/src/olympusapp.ts index 52e4140b..1dd3c97d 100644 --- a/frontend/react/src/olympusapp.ts +++ b/frontend/react/src/olympusapp.ts @@ -20,7 +20,7 @@ import { WeaponsManager } from "./weapon/weaponsmanager"; import { ServerManager } from "./server/servermanager"; import { AudioManager } from "./audio/audiomanager"; -import { GAME_MASTER, LoginSubState, NO_SUBSTATE, OlympusState, OlympusSubState, WarningSubstate } from "./constants/constants"; +import { GAME_MASTER, LoginSubState, MAP_OPTIONS_DEFAULTS, NO_SUBSTATE, OlympusState, OlympusSubState, WarningSubstate } from "./constants/constants"; import { AdminPasswordChangedEvent, AppStateChangedEvent, ConfigLoadedEvent, InfoPopupEvent, MapOptionsChangedEvent, SelectedUnitsChangedEvent, ShortcutsChangedEvent } from "./events"; import { OlympusConfig } from "./interfaces"; import { SessionDataManager } from "./sessiondata"; @@ -305,7 +305,7 @@ export class OlympusApp { const username = this.getServerManager().getUsername(); const profile = this.getProfile(); if (username && profile) { - this.#map?.setOptions(profile.mapOptions); + this.#map?.setOptions( {...profile.mapOptions, ...MAP_OPTIONS_DEFAULTS}); this.#shortcutManager?.setShortcutsOptions(profile.shortcuts); this.addInfoMessage("Profile loaded correctly"); console.log(`Profile for ${username} loaded correctly`); diff --git a/frontend/react/src/ui/panels/optionsmenu.tsx b/frontend/react/src/ui/panels/optionsmenu.tsx index fdc732f1..e0b5a84b 100644 --- a/frontend/react/src/ui/panels/optionsmenu.tsx +++ b/frontend/react/src/ui/panels/optionsmenu.tsx @@ -9,11 +9,10 @@ import { BindShortcutRequestEvent, MapOptionsChangedEvent, ShortcutsChangedEvent import { OlAccordion } from "../components/olaccordion"; import { Shortcut } from "../../shortcut/shortcut"; import { OlSearchBar } from "../components/olsearchbar"; -import { FaTrash, FaUserGroup, FaXmark } from "react-icons/fa6"; +import { FaXmark } from "react-icons/fa6"; import { OlCoalitionToggle } from "../components/olcoalitiontoggle"; -import { FaCog, FaKey, FaPlus, FaQuestionCircle } from "react-icons/fa"; +import { FaCog, FaQuestionCircle } from "react-icons/fa"; import { sha256 } from "js-sha256"; -import { OlDropdown, OlDropdownItem } from "../components/oldropdown"; const enum Accordion { NONE,