From 14911aa30f2464db9becc377ddfff00f6bbae753 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Fri, 7 Jun 2024 14:13:49 +0300
Subject: [PATCH] remove old bindings format support

---
 src/engine.cpp             |  8 --------
 src/files/engine_paths.cpp |  4 ----
 src/files/engine_paths.hpp |  1 -
 src/window/Events.cpp      | 25 -------------------------
 src/window/Events.hpp      |  1 -
 5 files changed, 39 deletions(-)

diff --git a/src/engine.cpp b/src/engine.cpp
index 6a06d80d..9d2c455f 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -116,14 +116,6 @@ void Engine::loadControls() {
         logger.info() << "loading controls";
         std::string text = files::read_string(controls_file);
         Events::loadBindings(controls_file.u8string(), text);
-    } else {
-        controls_file = paths->getControlsFileOld();
-        if (fs::is_regular_file(controls_file)) {
-            logger.info() << "loading controls (old)";
-            std::string text = files::read_string(controls_file);
-            Events::loadBindingsOld(controls_file.u8string(), text);
-            fs::remove(controls_file);
-        }
     }
 }
 
diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp
index 469f98cd..d99bb51b 100644
--- a/src/files/engine_paths.cpp
+++ b/src/files/engine_paths.cpp
@@ -61,10 +61,6 @@ fs::path EnginePaths::getControlsFile() {
     return userfiles/fs::path(CONTROLS_FILE);
 }
 
-fs::path EnginePaths::getControlsFileOld() {
-    return userfiles/fs::path("controls.json");
-}
-
 fs::path EnginePaths::getSettingsFile() {
     return userfiles/fs::path(SETTINGS_FILE);
 }
diff --git a/src/files/engine_paths.hpp b/src/files/engine_paths.hpp
index a41613ce..eb1fba3b 100644
--- a/src/files/engine_paths.hpp
+++ b/src/files/engine_paths.hpp
@@ -29,7 +29,6 @@ public:
     fs::path getWorldFolder();
     fs::path getWorldFolder(const std::string& name);
     fs::path getControlsFile();
-    fs::path getControlsFileOld(); // TODO: remove in 0.22
     fs::path getSettingsFile();
     bool isWorldNameUsed(const std::string& name);
 
diff --git a/src/window/Events.cpp b/src/window/Events.cpp
index 1aab7881..cd94946c 100644
--- a/src/window/Events.cpp
+++ b/src/window/Events.cpp
@@ -182,31 +182,6 @@ std::string Events::writeBindings() {
     return toml::stringify(obj);
 }
 
-void Events::loadBindingsOld(const std::string& filename, const std::string& source) {
-    auto obj = json::parse(filename, source);
-    for (auto& entry : Events::bindings) {
-        auto& binding = entry.second;
-
-        auto jentry = obj->map(entry.first);
-        if (jentry == nullptr)
-            continue;
-        inputtype type;
-        std::string typestr;
-        jentry->str("type", typestr);
-
-        if (typestr == "keyboard") {
-            type = inputtype::keyboard;
-        } else if (typestr == "mouse") {
-            type = inputtype::mouse;
-        } else {
-            logger.error() << "unknown input type '" << typestr << "'";
-            continue;
-        }
-        binding.type = type;
-        jentry->num("code", binding.code);
-    }
-}
-
 void Events::loadBindings(const std::string& filename, const std::string& source) {
     auto map = toml::parse(filename, source);
     for (auto& entry : map->values) {
diff --git a/src/window/Events.hpp b/src/window/Events.hpp
index 97405d2c..18402488 100644
--- a/src/window/Events.hpp
+++ b/src/window/Events.hpp
@@ -53,7 +53,6 @@ public:
 
     static std::string writeBindings();
     static void loadBindings(const std::string& filename, const std::string& source);
-    static void loadBindingsOld(const std::string& filename, const std::string& source); // TODO: remove in 0.22
 };
 
 #endif // WINDOW_EVENTS_HPP_