From 0e2ca7d8513d0365cda73db72073ea5167e3b091 Mon Sep 17 00:00:00 2001
From: "M. Sz" <mszeptuch@protonmail.com>
Date: Tue, 22 Dec 2020 14:59:15 +0100
Subject: [PATCH] removed unnecessary switch-case statments from onKeyUp and
 onEscKey

---
 d2game/d2player/game_controls.go | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/d2game/d2player/game_controls.go b/d2game/d2player/game_controls.go
index 27716811..9b278869 100644
--- a/d2game/d2player/game_controls.go
+++ b/d2game/d2player/game_controls.go
@@ -418,11 +418,8 @@ func (g *GameControls) OnKeyDown(event d2interface.KeyEvent) bool {
 func (g *GameControls) OnKeyUp(event d2interface.KeyEvent) bool {
 	gameEvent := g.keyMap.getGameEvent(event.Key())
 
-	switch gameEvent {
-	case d2enum.HoldRun:
+	if gameEvent == d2enum.HoldRun {
 		g.hud.onToggleRunButton(true)
-	default:
-		return false
 	}
 
 	return false
@@ -438,15 +435,15 @@ func (g *GameControls) onEscKey() {
 	escHandled = g.hasOpenPanels() || g.HelpOverlay.IsOpen() || g.hud.skillSelectMenu.IsOpen()
 	g.clearScreen()
 
-	switch escHandled {
-	case true:
+	if escHandled {
 		g.updateLayout()
-	case false:
-		if g.escapeMenu.IsOpen() {
-			g.escapeMenu.OnEscKey()
-		} else {
-			g.openEscMenu()
-		}
+		return
+	}
+
+	if g.escapeMenu.IsOpen() {
+		g.escapeMenu.OnEscKey()
+	} else {
+		g.openEscMenu()
 	}
 }
 
@@ -747,7 +744,7 @@ func (g *GameControls) updateLayout() {
 		g.mapRenderer.ViewportDefault()
 	case isRightPanelOpen:
 		g.mapRenderer.ViewportToLeft()
-	default:
+	case isLeftPanelOpen:
 		g.mapRenderer.ViewportToRight()
 	}
 }