From 8cd43c2a89e7fc73e132aa1fc85db6aba82a4a59 Mon Sep 17 00:00:00 2001 From: Guillaume Jacquemin Date: Sat, 7 Dec 2024 14:51:38 +0100 Subject: [PATCH] Application,Configuration: remove armoury stuff. This won't be supported any time soon. --- src/Application/Application_drawMainMenu.cpp | 22 ----------------- src/Configuration/Configuration.cpp | 25 -------------------- src/Configuration/Configuration.h | 3 --- 3 files changed, 50 deletions(-) diff --git a/src/Application/Application_drawMainMenu.cpp b/src/Application/Application_drawMainMenu.cpp index ed705b1..90a158d 100644 --- a/src/Application/Application_drawMainMenu.cpp +++ b/src/Application/Application_drawMainMenu.cpp @@ -66,28 +66,6 @@ Application::drawMainMenu() { openUri(Utility::Path::toNativeSeparators(conf().directories().staging)); } - /*if(ImGui::BeginMenu(ICON_FA_BOXES " Armoury")) { - if(ImGui::MenuItem(ICON_FA_SHIELD_ALT " Armour parts", nullptr, false, - Utility::Path::exists(conf().directories().armours))) - { - openUri(Utility::Path::toNativeSeparators(conf().directories().armours)); - } - - if(ImGui::MenuItem(ICON_FA_HAMMER " Weapons", nullptr, false, - Utility::Path::exists(conf().directories().weapons))) - { - openUri(Utility::Path::toNativeSeparators(conf().directories().weapons)); - } - - if(ImGui::MenuItem(ICON_FA_PALETTE " Custom styles", nullptr, false, - Utility::Path::exists(conf().directories().styles))) - { - openUri(Utility::Path::toNativeSeparators(conf().directories().styles)); - } - - ImGui::EndMenu(); - }*/ - ImGui::EndMenu(); } diff --git a/src/Configuration/Configuration.cpp b/src/Configuration/Configuration.cpp index fd64edf..969c9fb 100644 --- a/src/Configuration/Configuration.cpp +++ b/src/Configuration/Configuration.cpp @@ -119,10 +119,6 @@ Configuration::Configuration() { Containers::String executable_location = Utility::Path::split(*Utility::Path::executableLocation()).first(); _directories.backups = Utility::Path::join(executable_location, "backups"); _directories.staging = Utility::Path::join(executable_location, "staging"); - //auto armoury_dir = Utility::Path::join(executable_location, "armoury"); - //_directories.armours = Utility::Path::join(armoury_dir, "armours"); - //_directories.weapons = Utility::Path::join(armoury_dir, "weapons"); - //_directories.styles = Utility::Path::join(armoury_dir, "styles"); _directories.temp = Utility::Path::join(executable_location, "temp"); if(!Utility::Path::exists(_directories.backups)) { @@ -139,27 +135,6 @@ Configuration::Configuration() { return; } } - //if(!Utility::Path::exists(_directories.armours)) { - // LOG_WARNING("Armours directory not found, creating..."); - // if(!Utility::Path::make(_directories.armours)) { - // LOG_ERROR(_lastError = "Couldn't create the armours directory."); - // return; - // } - //} - //if(!Utility::Path::exists(_directories.weapons)) { - // LOG_WARNING("Weapons directory not found, creating..."); - // if(!Utility::Path::make(_directories.weapons)) { - // LOG_ERROR(_lastError = "Couldn't create the weapons directory."); - // return; - // } - //} - //if(!Utility::Path::exists(_directories.styles)) { - // LOG_WARNING("Styles directory not found, creating..."); - // if(!Utility::Path::make(_directories.styles)) { - // LOG_ERROR(_lastError = "Couldn't create the styles directory."); - // return; - // } - //} if(!Utility::Path::exists(_directories.temp)) { LOG_WARNING("Temporary directory not found, creating..."); diff --git a/src/Configuration/Configuration.h b/src/Configuration/Configuration.h index 37161dd..48c6452 100644 --- a/src/Configuration/Configuration.h +++ b/src/Configuration/Configuration.h @@ -70,9 +70,6 @@ class Configuration { Containers::String gameScreenshots; Containers::String backups; Containers::String staging; - Containers::String armours; - Containers::String weapons; - Containers::String styles; Containers::String temp; }; auto directories() const -> Directories const&;