gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-10 10:36:42 -05:00
Code Issues Releases Wiki Activity

removed unnecessary switch-case statments from onKeyUp and onEscKey

Browse Source
This commit is contained in:
M. Sz 2020-12-22 14:59:15 +01:00
parent 3a5175f034
commit 0e2ca7d851
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
d2game/d2player/game_controls.go
View File

@ -418,11 +418,8 @@ func (g *GameControls) OnKeyDown(event d2interface.KeyEvent) bool {
func (g *GameControls) OnKeyUp(event d2interface.KeyEvent) bool { func (g *GameControls) OnKeyUp(event d2interface.KeyEvent) bool {
gameEvent := g.keyMap.getGameEvent(event.Key()) gameEvent := g.keyMap.getGameEvent(event.Key())
switch gameEvent { if gameEvent == d2enum.HoldRun {
case d2enum.HoldRun:
g.hud.onToggleRunButton(true) g.hud.onToggleRunButton(true)
default:
return false
} }
return false return false
@ -438,16 +435,16 @@ func (g *GameControls) onEscKey() {
escHandled = g.hasOpenPanels() || g.HelpOverlay.IsOpen() || g.hud.skillSelectMenu.IsOpen() escHandled = g.hasOpenPanels() || g.HelpOverlay.IsOpen() || g.hud.skillSelectMenu.IsOpen()
g.clearScreen() g.clearScreen()
switch escHandled { if escHandled {
case true:
g.updateLayout() g.updateLayout()
case false: return
}
if g.escapeMenu.IsOpen() { if g.escapeMenu.IsOpen() {
g.escapeMenu.OnEscKey() g.escapeMenu.OnEscKey()
} else { } else {
g.openEscMenu() g.openEscMenu()
} }
}
} }
func truncateFloat64(n float64) float64 { func truncateFloat64(n float64) float64 {
@ -747,7 +744,7 @@ func (g *GameControls) updateLayout() {
g.mapRenderer.ViewportDefault() g.mapRenderer.ViewportDefault()
case isRightPanelOpen: case isRightPanelOpen:
g.mapRenderer.ViewportToLeft() g.mapRenderer.ViewportToLeft()
default: case isLeftPanelOpen:
g.mapRenderer.ViewportToRight() g.mapRenderer.ViewportToRight()
} }
} }