From 5de2c2de94f32a3e10c728e2514635d0a10d0467 Mon Sep 17 00:00:00 2001
From: Jaysc <jaysc2@gmail.com>
Date: Sun, 14 Jun 2020 14:16:37 +0100
Subject: [PATCH] Removed logic from application_settings

---
 src/js/game/camera.js                  | 6 +++---
 src/js/profile/application_settings.js | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/js/game/camera.js b/src/js/game/camera.js
index efb5d15b..6aefeae9 100644
--- a/src/js/game/camera.js
+++ b/src/js/game/camera.js
@@ -901,9 +901,9 @@ export class Camera extends BasicSerializableObject {
                 forceX += 1;
             }
 
-            let movementSpeed = this.root.app.settings.getMovementSpeed(
-                actionMapper.getBinding(KEYMAPPINGS.navigation.mapMoveFaster).isCurrentlyPressed()
-            );
+            let movementSpeed =
+                this.root.app.settings.getMovementSpeed() *
+                (actionMapper.getBinding(KEYMAPPINGS.navigation.mapMoveFaster).isCurrentlyPressed() ? 2 : 1);
 
             this.center.x += moveAmount * forceX * movementSpeed;
             this.center.y += moveAmount * forceY * movementSpeed;
diff --git a/src/js/profile/application_settings.js b/src/js/profile/application_settings.js
index 8807758b..87c2c244 100644
--- a/src/js/profile/application_settings.js
+++ b/src/js/profile/application_settings.js
@@ -302,14 +302,11 @@ export class ApplicationSettings extends ReadWriteProxy {
         return 1;
     }
 
-    /**
-     * @param {boolean} moveFaster
-     */
-    getMovementSpeed(moveFaster = false) {
+    getMovementSpeed() {
         const id = this.getAllSettings().movementSpeed;
         for (let i = 0; i < movementSpeeds.length; ++i) {
             if (movementSpeeds[i].id === id) {
-                return movementSpeeds[i].multiplier * (moveFaster ? 2 : 1);
+                return movementSpeeds[i].multiplier;
             }
         }
         logger.error("Unknown movement speed id:", id);